diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-28 16:38:41 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-10-28 16:38:41 +0300 |
commit | 9306d8fca2290ea6011d62f0eb62d2ac7fde9eb9 (patch) | |
tree | 9e479a7b7d4e223688ff4c35c492349517d76ee1 /app/finders | |
parent | eaebc20eba284a84fef17b2159f7eb6f87f2ff82 (diff) | |
parent | d3bdd3ba67dda8b8392770a2b6e4a7473ec4d42d (diff) |
Merge branch 'dashboard_issues_and_mr' into 'master'
Dashboard issues and merge request filters
Fixes #1597
See merge request !1219
Diffstat (limited to 'app/finders')
-rw-r--r-- | app/finders/issuable_finder.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 56c4f22120d..d0574240511 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -48,7 +48,7 @@ class IssuableFinder else [] end - elsif current_user && params[:authorized_only].presence + elsif current_user && params[:authorized_only].presence && !current_user_related? klass.of_projects(current_user.authorized_projects).references(:project) else klass.of_projects(ProjectsFinder.new.execute(current_user)).references(:project) @@ -142,4 +142,8 @@ class IssuableFinder def project Project.where(id: params[:project_id]).first if params[:project_id].present? end + + def current_user_related? + params[:scope] == 'created-by-me' || params[:scope] == 'authored' || params[:scope] == 'assigned-to-me' + end end |