diff options
| -rw-r--r-- | app/models/label.rb | 8 | ||||
| -rw-r--r-- | app/views/projects/labels/_label.html.haml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/label.rb b/app/models/label.rb index f7ffc0b7f36..500d5a35521 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -97,12 +97,12 @@ class Label < ActiveRecord::Base end end - def open_issues_count - issues.opened.count + def open_issues_count(user = nil) + issues.visible_to_user(user).opened.count end - def closed_issues_count - issues.closed.count + def closed_issues_count(user = nil) + issues.visible_to_user(user).closed.count end def open_merge_requests_count diff --git a/app/views/projects/labels/_label.html.haml b/app/views/projects/labels/_label.html.haml index 4927d239c1e..0612863296a 100644 --- a/app/views/projects/labels/_label.html.haml +++ b/app/views/projects/labels/_label.html.haml @@ -8,7 +8,7 @@ %strong.append-right-20 = link_to_label(label) do - = pluralize label.open_issues_count, 'open issue' + = pluralize label.open_issues_count(current_user), 'open issue' - if current_user .label-subscription{data: {url: toggle_subscription_namespace_project_label_path(@project.namespace, @project, label)}} |