Commit e2b6e9c3 authored by Jacob Schatz's avatar Jacob Schatz

Add ajax calls to return JSON

Fix subtitles on minimize.
Fix styles for show.
parent 541fcc37
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
display: none; display: none;
} }
aside { aside:not(.right-sidebar){
display: none; display: none;
} }
......
...@@ -284,6 +284,15 @@ ...@@ -284,6 +284,15 @@
@include collapsed-sidebar; @include collapsed-sidebar;
} }
.page-gutter {
&.right-sidebar-collapsed {
@include collapsed-gutter;
}
&.right-sidebar-expanded {
@include expanded-gutter;
}
}
.collapse-nav { .collapse-nav {
display: none; display: none;
} }
......
...@@ -98,7 +98,9 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -98,7 +98,9 @@ class Projects::IssuesController < Projects::ApplicationController
format.json do format.json do
render json: { render json: {
saved: @issue.valid?, saved: @issue.valid?,
assignee_avatar_url: @issue.assignee.try(:avatar_url) assignee_avatar_url: @issue.assignee.try(:avatar_url),
milestone: @issue.milestone.title,
labels: @issue.labels.pluck(:id,:title,:color)
} }
end end
end end
......
...@@ -57,6 +57,5 @@ ...@@ -57,6 +57,5 @@
%section.col-md-12 %section.col-md-12
.issuable-discussion .issuable-discussion
= render 'projects/issues/discussion' = render 'projects/issues/discussion'
= render 'shared/show_aside'
= render 'shared/issuable/sidebar', issuable: @issue = render 'shared/issuable/sidebar', issuable: @issue
\ No newline at end of file
...@@ -73,7 +73,6 @@ ...@@ -73,7 +73,6 @@
%section.col-md-12 %section.col-md-12
.issuable-discussion .issuable-discussion
= render "projects/merge_requests/discussion" = render "projects/merge_requests/discussion"
= render 'shared/show_aside'
#commits.commits.tab-pane #commits.commits.tab-pane
- # This tab is always loaded via AJAX - # This tab is always loaded via AJAX
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%a.btn.btn-default.disabled{href: '#'} %a.btn.btn-default.disabled{href: '#'}
Next Next
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f| = form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, html: {class: 'issuable-context-form inline-update js-issuable-update', 'data-type' => 'json'} do |f|
.block.assignee .block.assignee
.sidebar-collapsed-icon .sidebar-collapsed-icon
- if issuable.assignee - if issuable.assignee
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment