diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-09-18 11:18:00 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-09-18 11:18:00 +0300 |
commit | 85ca8931de2d59920f2804771db4ac6a6e44a73c (patch) | |
tree | 8754a7a6b17f0012bafef0c3d379f41a22f35a42 /app | |
parent | 97664956277cc2433887062afabc9b35c779c414 (diff) | |
parent | 50a62b479e354efce5d85dd46bc25033cfd066f3 (diff) |
Merge branch '45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master'
Resolve "Open issues from archived project listed in group issue board"
Closes #45754
See merge request gitlab-org/gitlab-ce!21721
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 4 | ||||
-rw-r--r-- | app/services/boards/issues/list_service.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 7ca456031a0..eeac87e2e52 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1182,13 +1182,13 @@ class User < ActiveRecord::Base def assigned_open_merge_requests_count(force: false) Rails.cache.fetch(['users', id, 'assigned_open_merge_requests_count'], force: force, expires_in: 20.minutes) do - MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened').execute.count + MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened', non_archived: true).execute.count end end def assigned_open_issues_count(force: false) Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], force: force, expires_in: 20.minutes) do - IssuesFinder.new(self, assignee_id: self.id, state: 'opened').execute.count + IssuesFinder.new(self, assignee_id: self.id, state: 'opened', non_archived: true).execute.count end end diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index 4e352f2dc63..0b69661bbd0 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -56,6 +56,7 @@ module Boards set_parent set_state set_scope + set_non_archived params end @@ -76,6 +77,10 @@ module Boards params[:include_subgroups] = board.group_board? end + def set_non_archived + params[:non_archived] = parent.is_a?(Group) + end + # rubocop: disable CodeReuse/ActiveRecord def board_label_ids @board_label_ids ||= board.lists.movable.pluck(:label_id) |