diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-21 20:21:23 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-03-22 15:29:57 -0300 |
| commit | 8ca5b33175ae809fabc0d88bf16b0325e59f7203 (patch) | |
| tree | 69642474bca042979db42de7832b16d27f3accee | |
| parent | 0a8c9f72127bfff265059c68c2c19bc1ad4bd5a5 (diff) | |
| download | gitlab-ce-notifications-for-subscribers-confidential-issue-labels.tar.gz | |
Fix issues count on labels pagenotifications-for-subscribers-confidential-issue-labels
| -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)}} |