Commit 95d61a09 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve admin/projects page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 4e55dd5f
...@@ -21,9 +21,19 @@ ...@@ -21,9 +21,19 @@
} }
.admin-filter form { .admin-filter form {
label { width: 110px; } .select2-container {
.controls { margin-left: 130px; } width: 100%
.form-actions { padding-left: 130px; background: #fff } }
.controls {
margin-left: 130px;
}
.form-actions {
padding-left: 130px;
background: #fff
}
.visibility-levels { .visibility-levels {
.controls { .controls {
margin-bottom: 9px; margin-bottom: 9px;
......
...@@ -4,10 +4,8 @@ class Admin::ProjectsController < Admin::ApplicationController ...@@ -4,10 +4,8 @@ class Admin::ProjectsController < Admin::ApplicationController
before_filter :repository, only: [:show, :transfer] before_filter :repository, only: [:show, :transfer]
def index def index
owner_id = params[:owner_id] @projects = Project.all
user = User.find_by(id: owner_id) @projects = @projects.where(namespace_id: params[:namespace_id]) if params[:namespace_id].present?
@projects = user ? user.owned_projects : Project.all
@projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present? @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?
@projects = @projects.with_push if params[:with_push].present? @projects = @projects.with_push if params[:with_push].present?
@projects = @projects.abandoned if params[:abandoned].present? @projects = @projects.abandoned if params[:abandoned].present?
......
.row .row
.col-md-4 .col-md-3
.admin-filter .admin-filter
= form_tag admin_projects_path, method: :get, class: '' do = form_tag admin_projects_path, method: :get, class: '' do
.form-group .form-group
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
= text_field_tag :name, params[:name], class: "form-control" = text_field_tag :name, params[:name], class: "form-control"
.form-group .form-group
= label_tag :owner_id, 'Owner:' = label_tag :namespace_id, "Namespace"
%div = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
= users_select_tag :owner_id, selected: params[:owner_id], class: 'input-large input-clamp'
.form-group
%strong Activity
.checkbox .checkbox
= label_tag :with_push, 'Not empty' = label_tag :with_push, 'Not empty'
= check_box_tag :with_push, 1, params[:with_push] = check_box_tag :with_push, 1, params[:with_push]
...@@ -31,12 +33,12 @@ ...@@ -31,12 +33,12 @@
%span.descr %span.descr
= visibility_level_icon(level) = visibility_level_icon(level)
= label = label
.form-actions %hr
= hidden_field_tag :sort, params[:sort] = hidden_field_tag :sort, params[:sort]
= submit_tag "Search", class: "btn submit btn-primary" = submit_tag "Search", class: "btn submit btn-primary"
= link_to "Reset", admin_projects_path, class: "btn" = link_to "Reset", admin_projects_path, class: "btn btn-cancel"
.col-md-8 .col-md-9
.panel.panel-default .panel.panel-default
.panel-heading .panel-heading
Projects (#{@projects.total_count}) Projects (#{@projects.total_count})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment