diff options
| author | Josh Frye <joshfng@gmail.com> | 2016-05-31 09:02:47 -0400 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-06-02 09:13:59 -0400 |
| commit | bfccea370310d6f7e5fe16c846ccd073d487a97f (patch) | |
| tree | 1f67075c81ee4faa10e10dcde295e8519fbc7540 /app | |
| parent | bffe0d6325710e89e405390f4da297fb12fdc314 (diff) | |
| download | gitlab-ce-bfccea370310d6f7e5fe16c846ccd073d487a97f.tar.gz | |
Cache assigned open issue count. Closes #18035
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 10 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 8dde01bf355..55f8e149629 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -778,8 +778,14 @@ class User < ActiveRecord::Base def assigned_open_merge_request_count Rails.cache.fetch(['users', id, 'assigned_open_merge_request_count'], expires_in: 60) do - assigned_merge_requests.opened.count - end + assigned_merge_requests.opened.count + end + end + + def assigned_open_issues_count + Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], expires_in: 60) do + assigned_issues.opened.count + end end private diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index e14ae850fcc..306ebd5fcf7 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -30,7 +30,7 @@ = icon('exclamation-circle fw') %span Issues - %span.count= number_with_delimiter(current_user.assigned_issues.opened.count) + %span.count= number_with_delimiter(current_user.assigned_open_issues_count) = nav_link(path: 'dashboard#merge_requests') do = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'dashboard-shortcuts-merge_requests' do = icon('tasks fw') |