Download as
Browse Code »

Commit bf13579b929151aa80ca957486b1851b067aa4ac

Authored by Dmitriy Zaporozhets
1 parent 2b79706d
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Make admin sorting more obvious

Showing 8 changed files with 68 additions and 20 deletions   Show diff stats
app/controllers/admin/groups_controller.rb
  Diff comments   View file @bf13579
@@ -2,7 +2,7 @@ class Admin::GroupsController < AdminController @@ -2,7 +2,7 @@ class Admin::GroupsController < AdminController
2 before_filter :group, only: [:edit, :show, :update, :destroy, :project_update] 2 before_filter :group, only: [:edit, :show, :update, :destroy, :project_update]
3 3
4 def index 4 def index
5 - @groups = Group.scoped 5 + @groups = Group.order('name ASC')
6 @groups = @groups.search(params[:name]) if params[:name].present? 6 @groups = @groups.search(params[:name]) if params[:name].present?
7 @groups = @groups.page(params[:page]).per(20) 7 @groups = @groups.page(params[:page]).per(20)
8 end 8 end
app/controllers/admin/users_controller.rb
  Diff comments   View file @bf13579
@@ -3,7 +3,7 @@ class Admin::UsersController < AdminController @@ -3,7 +3,7 @@ class Admin::UsersController < AdminController
3 @admin_users = User.scoped 3 @admin_users = User.scoped
4 @admin_users = @admin_users.filter(params[:filter]) 4 @admin_users = @admin_users.filter(params[:filter])
5 @admin_users = @admin_users.search(params[:name]) if params[:name].present? 5 @admin_users = @admin_users.search(params[:name]) if params[:name].present?
6 - @admin_users = @admin_users.order("updated_at DESC").page(params[:page]) 6 + @admin_users = @admin_users.order("name ASC").page(params[:page])
7 end 7 end
8 8
9 def show 9 def show
app/roles/repository.rb
  Diff comments   View file @bf13579
@@ -45,8 +45,22 @@ module Repository @@ -45,8 +45,22 @@ module Repository
45 end 45 end
46 46
47 def has_post_receive_file? 47 def has_post_receive_file?
48 - hook_file = File.join(path_to_repo, 'hooks', 'post-receive')  
49 - File.exists?(hook_file) 48 + !!hook_file
  49 + end
  50 +
  51 + def valid_post_receive_file?
  52 + valid_hook_file == hook_file
  53 + end
  54 +
  55 + def valid_hook_file
  56 + @valid_hook_file ||= File.read(Rails.root.join('lib', 'hooks', 'post-receive'))
  57 + end
  58 +
  59 + def hook_file
  60 + @hook_file ||= begin
  61 + hook_path = File.join(path_to_repo, 'hooks', 'post-receive')
  62 + File.read(hook_path) if File.exists?(hook_path)
  63 + end
50 end 64 end
51 65
52 # Returns an Array of branch names 66 # Returns an Array of branch names
app/views/admin/groups/index.html.haml
  Diff comments   View file @bf13579
@@ -12,16 +12,22 @@ @@ -12,16 +12,22 @@
12 12
13 %table 13 %table
14 %thead 14 %thead
15 - %th Name 15 + %th
  16 + Name
  17 + %i.icon-sort-down
16 %th Path 18 %th Path
17 %th Projects 19 %th Projects
  20 + %th Owner
18 %th.cred Danger Zone! 21 %th.cred Danger Zone!
19 22
20 - @groups.each do |group| 23 - @groups.each do |group|
21 %tr 24 %tr
22 - %td= link_to group.name, [:admin, group] 25 + %td
  26 + %strong= link_to group.name, [:admin, group]
23 %td= group.path 27 %td= group.path
24 %td= group.projects.count 28 %td= group.projects.count
  29 + %td
  30 + = link_to group.owner_name, admin_user_path(group.owner_id)
25 %td.bgred 31 %td.bgred
26 = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small" 32 = link_to 'Rename', edit_admin_group_path(group), id: "edit_#{dom_id(group)}", class: "btn small"
27 = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger" 33 = link_to 'Destroy', [:admin, group], confirm: "REMOVE #{group.name}? Are you sure?", method: :delete, class: "btn small danger"
app/views/admin/projects/index.html.haml
  Diff comments   View file @bf13579
@@ -9,7 +9,9 @@ @@ -9,7 +9,9 @@
9 9
10 %table 10 %table
11 %thead 11 %thead
12 - %th Name 12 + %th
  13 + Name
  14 + %i.icon-sort-down
13 %th Path 15 %th Path
14 %th Team Members 16 %th Team Members
15 %th Last Commit 17 %th Last Commit
app/views/admin/projects/show.html.haml
  Diff comments   View file @bf13579
@@ -4,14 +4,24 @@ @@ -4,14 +4,24 @@
4 %i.icon-edit 4 %i.icon-edit
5 Edit 5 Edit
6 6
7 -- if !@project.has_post_receive_file? && @project.has_commits?  
8 - %br  
9 - .alert.alert-error  
10 - %span  
11 - %strong Important!  
12 - Project has commits but missing post-receive file.  
13 - %br  
14 - If you exported project manually - copy post-receive hook to bare repository 7 +- if @project.has_commits?
  8 + - if !@project.has_post_receive_file?
  9 + %br
  10 + .alert.alert-error
  11 + %span
  12 + %strong Project has commits but missing post-receive file.
  13 + %br
  14 + If you exported project manually - make a link of post-receive hook file from gitolite to project repository
  15 + - elsif !@project.valid_post_receive_file?
  16 + %br
  17 + .alert.alert-error
  18 + %span
  19 + %strong Project has invalid post-receive file.
  20 + %br
  21 + 1. Make sure your gitolite instace has latest post-receive file.
  22 + %br
  23 + 2. Make a link of post-receive hook file from gitolite to project repository
  24 +
15 25
16 %br 26 %br
17 %table.zebra-striped 27 %table.zebra-striped
@@ -53,7 +63,7 @@ @@ -53,7 +63,7 @@
53 %td 63 %td
54 = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true 64 = check_box_tag :post_receive_file, 1, @project.has_post_receive_file?, disabled: true
55 %br 65 %br
56 -%h3 66 +%h5
57 Team 67 Team
58 %small 68 %small
59 (#{@project.users_projects.count}) 69 (#{@project.users_projects.count})
@@ -75,7 +85,7 @@ @@ -75,7 +85,7 @@
75 %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small" 85 %td= link_to 'Remove from team', admin_team_member_path(tm), confirm: 'Are you sure?', method: :delete, class: "btn danger small"
76 86
77 %br 87 %br
78 -%h3 Add new team member 88 +%h5 Add new team member
79 %br 89 %br
80 = form_tag team_update_admin_project_path(@project), class: "bulk_import", method: :put do 90 = form_tag team_update_admin_project_path(@project), class: "bulk_import", method: :put do
81 %table.zebra-striped 91 %table.zebra-striped
app/views/admin/users/index.html.haml
  Diff comments   View file @bf13579
@@ -22,7 +22,9 @@ @@ -22,7 +22,9 @@
22 %table 22 %table
23 %thead 23 %thead
24 %th Admin 24 %th Admin
25 - %th Name 25 + %th
  26 + Name
  27 + %i.icon-sort-down
26 %th Username 28 %th Username
27 %th Email 29 %th Email
28 %th Projects 30 %th Projects
app/views/admin/users/show.html.haml
  Diff comments   View file @bf13579
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 = @admin_user.twitter 66 = @admin_user.twitter
67 67
68 %br 68 %br
69 -%h3 Add User to Projects 69 +%h5 Add User to Projects
70 %br 70 %br
71 = form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put do 71 = form_tag team_update_admin_user_path(@admin_user), class: "bulk_import", method: :put do
72 %table 72 %table
@@ -86,8 +86,22 @@ @@ -86,8 +86,22 @@
86 %strong= link_to "here", help_permissions_path, class: "vlink" 86 %strong= link_to "here", help_permissions_path, class: "vlink"
87 %br 87 %br
88 88
  89 +- if @admin_user.groups.present?
  90 + %h5 Owner of groups:
  91 + %br
  92 +
  93 + %table.zebra-striped
  94 + %thead
  95 + %tr
  96 + %th Name
  97 +
  98 + - @admin_user.groups.each do |group|
  99 + %tr
  100 + %td= link_to group.name, admin_group_path(group)
  101 +
  102 +
89 - if @admin_user.projects.present? 103 - if @admin_user.projects.present?
90 - %h3 Projects 104 + %h5 Projects:
91 %br 105 %br
92 106
93 %table.zebra-striped 107 %table.zebra-striped