move links to browse issuables into sidebar

2 files changed, 39 insertions, 26 deletions

diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml
index 31b245d2be7..edacae0b4ab 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -44,12 +44,22 @@
             = link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "pull-right", title: "New Issue" do
               New issue
         .value.hide-collapsed
-          %span.milestone-stat
-            Open:
-            = milestone.issues_visible_to_user(current_user).opened.size
-          %span.milestone-stat
-            Closed:
-            = milestone.issues_visible_to_user(current_user).closed.size
+          - if project && can?(current_user, :read_issue, project)
+            %span.milestone-stat
+              = link_to milestones_browse_issuables_path(milestone, type: :issues) do
+                Open:
+                = milestone.issues_visible_to_user(current_user).opened.size
+            %span.milestone-stat
+              = link_to milestones_browse_issuables_path(milestone, type: :issues, state: 'closed') do
+                Closed:
+                = milestone.issues_visible_to_user(current_user).closed.size
+          - else
+            %span.milestone-stat
+              Open:
+              = milestone.issues_visible_to_user(current_user).opened.size
+            %span.milestone-stat
+              Closed:
+              = milestone.issues_visible_to_user(current_user).closed.size
 
     .block
       .sidebar-collapsed-icon
@@ -60,15 +70,29 @@
         Merge requests
         %span.badge= milestone.merge_requests.size
       .value.hide-collapsed
-        %span.milestone-stat
-          Open:
-          = milestone.merge_requests.opened.size
-        %span.milestone-stat
-          Closed:
-          = milestone.merge_requests.closed.size
-        %span.milestone-stat
-          Merged:
-          = milestone.merge_requests.merged.size
+        - if project && can?(current_user, :read_merge_request, project)
+          %span.milestone-stat
+            = link_to milestones_browse_issuables_path(milestone, type: :merge_requests) do
+              Open:
+              = milestone.merge_requests.opened.size
+          %span.milestone-stat
+            = link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'closed') do
+              Closed:
+              = milestone.merge_requests.closed.size
+          %span.milestone-stat
+            = link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'merged') do
+              Merged:
+              = milestone.merge_requests.merged.size
+        - else
+          %span.milestone-stat
+            Open:
+            = milestone.merge_requests.opened.size
+          %span.milestone-stat
+            Closed:
+            = milestone.merge_requests.closed.size
+          %span.milestone-stat
+            Merged:
+            = milestone.merge_requests.merged.size
 
     - milestone_ref = milestone.try(:to_reference, full: true)
     - if milestone_ref.present?
diff --git a/app/views/shared/milestones/_summary.html.haml b/app/views/shared/milestones/_summary.html.haml
index 885c521ca38..9c08dd5f5fe 100644
--- a/app/views/shared/milestones/_summary.html.haml
+++ b/app/views/shared/milestones/_summary.html.haml
@@ -10,15 +10,4 @@
           %strong== #{milestone.percent_complete(current_user)}%
           complete
 
-      .milestone-progress-buttons
-        %span.tab-issues-buttons
-          - if project
-            - if can?(current_user, :create_issue, project)
-              = link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "btn", title: "New Issue" do
-                New Issue
-            - if can?(current_user, :read_issue, project)
-              = link_to 'Browse Issues', milestones_browse_issuables_path(milestone, type: :issues), class: "btn"
-        %span.tab-merge-requests-buttons.hidden
-          = link_to 'Browse Merge Requests', milestones_browse_issuables_path(milestone, type: :merge_requests), class: "btn"
-
     = milestone_progress_bar(milestone)