diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-05-26 17:55:49 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-07-07 13:25:58 -0500 |
| commit | 338072cc4ba66cd7eb6fbd9541862946e4ae4b75 (patch) | |
| tree | 41b4782724653a42328f155edc5cf57b6d227f16 /app/controllers | |
| parent | 86d83a3a85dfc252ee5efb8cc630e1a4295adb93 (diff) | |
| download | gitlab-ce-338072cc4ba66cd7eb6fbd9541862946e4ae4b75.tar.gz | |
Layout for Users Groups and Projects on admin area
Diffstat (limited to 'app/controllers')
| -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]) |