diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /app/finders/todos_finder.rb | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'app/finders/todos_finder.rb')
-rw-r--r-- | app/finders/todos_finder.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/finders/todos_finder.rb b/app/finders/todos_finder.rb index a2054f73c9d..f28e1281488 100644 --- a/app/finders/todos_finder.rb +++ b/app/finders/todos_finder.rb @@ -10,6 +10,7 @@ # action_id: integer # author_id: integer # project_id; integer +# target_id; integer # state: 'pending' (default) or 'done' # type: 'Issue' or 'MergeRequest' or ['Issue', 'MergeRequest'] # @@ -23,7 +24,7 @@ class TodosFinder NONE = '0' - TODO_TYPES = Set.new(%w(Issue MergeRequest DesignManagement::Design)).freeze + TODO_TYPES = Set.new(%w(Issue MergeRequest DesignManagement::Design AlertManagement::Alert)).freeze attr_accessor :current_user, :params @@ -47,6 +48,7 @@ class TodosFinder items = by_action(items) items = by_author(items) items = by_state(items) + items = by_target_id(items) items = by_types(items) items = by_group(items) # Filtering by project HAS TO be the last because we use @@ -198,6 +200,12 @@ class TodosFinder items.with_states(params[:state]) end + def by_target_id(items) + return items if params[:target_id].blank? + + items.for_target(params[:target_id]) + end + def by_types(items) if types.any? items.for_type(types) |