diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-07-07 23:48:02 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-07-07 23:48:02 -0400 |
| commit | 0de617772dfeb9bdcf3770e9acf7421db5023058 (patch) | |
| tree | 692dc0d93425536e782264c750ecc8bada8d1851 /app/controllers/admin | |
| parent | cfb5a76bb26521ff3ff68acc20466ea7feb49d9f (diff) | |
| download | gitlab-ce-0de617772dfeb9bdcf3770e9acf7421db5023058.tar.gz | |
Revert "Revert "Merge branch 'issue_3946' into 'master'
""
This reverts commit bf2a86b73cce332ff8f4392ffc8df501193f32ec.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/projects_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 4c9c6362ffc..0d2f4f6eb38 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -5,11 +5,12 @@ class Admin::ProjectsController < Admin::ApplicationController def index @projects = Project.all @projects = @projects.in_namespace(params[:namespace_id]) if params[:namespace_id].present? - @projects = @projects.where("projects.visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present? + @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present? @projects = @projects.with_push if params[:with_push].present? @projects = @projects.abandoned if params[:abandoned].present? @projects = @projects.where(last_repository_check_failed: true) if params[:last_repository_check_failed].present? - @projects = @projects.non_archived unless params[:with_archived].present? + @projects = @projects.non_archived unless params[:archived].present? + @projects = @projects.personal(current_user) if params[:personal].present? @projects = @projects.search(params[:name]) if params[:name].present? @projects = @projects.sort(@sort = params[:sort]) @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]) |