Commit 48a30a7a authored by Mike Greiling's avatar Mike Greiling

prever #count over #size when calculating issue/mr totals

parent 36714377
...@@ -68,10 +68,10 @@ ...@@ -68,10 +68,10 @@
.sidebar-collapsed-icon .sidebar-collapsed-icon
%strong %strong
= icon('hashtag', 'aria-hidden': 'true') = icon('hashtag', 'aria-hidden': 'true')
%span= milestone.issues_visible_to_user(current_user).size %span= milestone.issues_visible_to_user(current_user).count
.title.hide-collapsed .title.hide-collapsed
Issues Issues
%span.badge= milestone.issues_visible_to_user(current_user).size %span.badge= milestone.issues_visible_to_user(current_user).count
- if project && can?(current_user, :create_issue, project) - if project && can?(current_user, :create_issue, project)
= link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "pull-right", title: "New Issue" do = link_to new_namespace_project_issue_path(project.namespace, project, issue: { milestone_id: milestone.id }), class: "pull-right", title: "New Issue" do
New issue New issue
...@@ -79,44 +79,44 @@ ...@@ -79,44 +79,44 @@
%span.milestone-stat %span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :issues) do = link_to milestones_browse_issuables_path(milestone, type: :issues) do
Open: Open:
= milestone.issues_visible_to_user(current_user).opened.size = milestone.issues_visible_to_user(current_user).opened.count
%span.milestone-stat %span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :issues, state: 'closed') do = link_to milestones_browse_issuables_path(milestone, type: :issues, state: 'closed') do
Closed: Closed:
= milestone.issues_visible_to_user(current_user).closed.size = milestone.issues_visible_to_user(current_user).closed.count
.block .block
.sidebar-collapsed-icon .sidebar-collapsed-icon
%strong %strong
= icon('exclamation', 'aria-hidden': 'true') = icon('exclamation', 'aria-hidden': 'true')
%span= milestone.issues_visible_to_user(current_user).size %span= milestone.issues_visible_to_user(current_user).count
.title.hide-collapsed .title.hide-collapsed
Merge requests Merge requests
%span.badge= milestone.merge_requests.size %span.badge= milestone.merge_requests.count
.value.hide-collapsed.bold .value.hide-collapsed.bold
- if !project || can?(current_user, :read_merge_request, project) - if !project || can?(current_user, :read_merge_request, project)
%span.milestone-stat %span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :merge_requests) do = link_to milestones_browse_issuables_path(milestone, type: :merge_requests) do
Open: Open:
= milestone.merge_requests.opened.size = milestone.merge_requests.opened.count
%span.milestone-stat %span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'closed') do = link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'closed') do
Closed: Closed:
= milestone.merge_requests.closed.size = milestone.merge_requests.closed.count
%span.milestone-stat %span.milestone-stat
= link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'merged') do = link_to milestones_browse_issuables_path(milestone, type: :merge_requests, state: 'merged') do
Merged: Merged:
= milestone.merge_requests.merged.size = milestone.merge_requests.merged.count
- else - else
%span.milestone-stat %span.milestone-stat
Open: Open:
= milestone.merge_requests.opened.size = milestone.merge_requests.opened.count
%span.milestone-stat %span.milestone-stat
Closed: Closed:
= milestone.merge_requests.closed.size = milestone.merge_requests.closed.count
%span.milestone-stat %span.milestone-stat
Merged: Merged:
= milestone.merge_requests.merged.size = milestone.merge_requests.merged.count
- milestone_ref = milestone.try(:to_reference, full: true) - milestone_ref = milestone.try(:to_reference, full: true)
- if milestone_ref.present? - if milestone_ref.present?
......
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