diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-04-22 11:40:01 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-04-22 11:59:09 +0300 |
| commit | 76c215cbd00614385cac3b2b3e0bb0cfaee246ee (patch) | |
| tree | 8250b812424e7929f9ac025c104375dd8108a53f /app/controllers/concerns/filter_projects.rb | |
| parent | c291e9b5531db0585d12d6ff59c46eae0c2306f0 (diff) | |
Merge branch 'issue_3799' into 'master'
Allow filtering by Owned projects on dashboard page
Closes #3799
See merge request !3762
Diffstat (limited to 'app/controllers/concerns/filter_projects.rb')
| -rw-r--r-- | app/controllers/concerns/filter_projects.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/concerns/filter_projects.rb b/app/controllers/concerns/filter_projects.rb index f63b703d101..586f97c5eb4 100644 --- a/app/controllers/concerns/filter_projects.rb +++ b/app/controllers/concerns/filter_projects.rb @@ -10,6 +10,8 @@ module FilterProjects def filter_projects(projects) projects = projects.search(params[:filter_projects]) if params[:filter_projects].present? projects = projects.non_archived if params[:archived].blank? + projects = projects.personal(current_user) if params[:personal].present? && current_user + projects end end |