Adds link to milestone and keeping resource context on smaller

viewports for issues and merge requests

3 files changed, 16 insertions, 11 deletions

diff --git a/app/views/projects/issues/_discussion.html.haml b/app/views/projects/issues/_discussion.html.haml
index b5d6a16a1e1..e04e1985f1f 100644
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
@@ -13,7 +13,7 @@
         = link_to_member(@project, participant, name: false, size: 24)
 
     .voting_notes#notes= render "projects/notes/notes_with_form"
-  .col-md-3.hidden-sm.hidden-xs
+  .col-md-3
     %div
     .clearfix
       %span.slead.has_tooltip{:"data-original-title" => 'Cross-project reference'}
diff --git a/app/views/projects/issues/_issue_context.html.haml b/app/views/projects/issues/_issue_context.html.haml
index 98777a58f9d..3daa18ba346 100644
--- a/app/views/projects/issues/_issue_context.html.haml
+++ b/app/views/projects/issues/_issue_context.html.haml
@@ -2,23 +2,21 @@
   %div.prepend-top-20
     %p
       Assignee:
-
+      - if issue.assignee
+        = link_to_member(@project, @issue.assignee)
+      - else
+        none
     - if can?(current_user, :modify_issue, @issue)
       = project_users_select_tag('issue[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @issue.assignee_id)
-    - elsif issue.assignee
-      = link_to_member(@project, @issue.assignee)
-    - else
-      None
 
   %div.prepend-top-20
     %p
       Milestone:
+      - if issue.milestone
+        #{link_to @issue.milestone.title, project_milestone_path(@project, @issue.milestone)}
+      - else
+        none
     - if can?(current_user, :modify_issue, @issue)
       = f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone" }, {class: 'select2 select2-compact js-select2 js-milestone'})
       = hidden_field_tag :issue_context
       = f.submit class: 'btn'
-    - elsif issue.milestone
-      = link_to project_milestone_path(@project, @issue.milestone) do
-        = @issue.milestone.title
-    - else
-      None
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml
index 6e50667b084..7a5e0517556 100644
--- a/app/views/projects/issues/update.js.haml
+++ b/app/views/projects/issues/update.js.haml
@@ -3,8 +3,15 @@
     :plain
       $("##{dom_id(@issue)}").fadeOut();
 - elsif params[:issue_context]
+  $('.context').html("#{escape_javascript(render partial: 'issue_context', locals: { issue: @issue })}");
   $('.context').effect('highlight');
   - if @issue.milestone
     $('.milestone-nav-link').replaceWith("<span class='milestone-nav-link'>| <span class='light'>Milestone</span> #{escape_javascript(link_to @issue.milestone.title, project_milestone_path(@issue.project, @issue.milestone))}</span>")
   - else
     $('.milestone-nav-link').html('')
+
+
+$('select.select2').select2({width: 'resolve', dropdownAutoWidth: true})
+$('.edit-issue.inline-update input[type="submit"]').hide();
+new ProjectUsersSelect();
+new Issue();