Download as
Browse Code »

Commit ee13297af2706be438666a3761938423fc9a51db

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

Cleanup: removed unused routing/methods. Improved admin area usability

Showing 9 changed files with 22 additions and 93 deletions   Show diff stats
app/controllers/admin/groups_controller.rb
  Diff comments   View file @ee13297
@@ -44,16 +44,6 @@ class Admin::GroupsController < Admin::ApplicationController @@ -44,16 +44,6 @@ class Admin::GroupsController < Admin::ApplicationController
44 end 44 end
45 end 45 end
46 46
47 - def project_update  
48 - project_ids = params[:project_ids]  
49 -  
50 - Project.where(id: project_ids).each do |project|  
51 - project.transfer(@group)  
52 - end  
53 -  
54 - redirect_to :back, notice: 'Group was successfully updated.'  
55 - end  
56 -  
57 def project_teams_update 47 def project_teams_update
58 @group.add_users(params[:user_ids].split(','), params[:group_access]) 48 @group.add_users(params[:user_ids].split(','), params[:group_access])
59 49
app/controllers/admin/projects/members_controller.rb
  Diff comments   View file @ee13297
1 class Admin::Projects::MembersController < Admin::Projects::ApplicationController 1 class Admin::Projects::MembersController < Admin::Projects::ApplicationController
2 - def edit  
3 - @member = team_member  
4 - @project = project  
5 - @team_member_relation = team_member_relation  
6 - end  
7 -  
8 - def update  
9 - if team_member_relation.update_attributes(params[:team_member])  
10 - redirect_to [:admin, project], notice: 'Project Access was successfully updated.'  
11 - else  
12 - render action: "edit"  
13 - end  
14 - end  
15 -  
16 def destroy 2 def destroy
17 team_member_relation.destroy 3 team_member_relation.destroy
18 4
@@ -28,5 +14,4 @@ class Admin::Projects::MembersController &lt; Admin::Projects::ApplicationControlle @@ -28,5 +14,4 @@ class Admin::Projects::MembersController &lt; Admin::Projects::ApplicationControlle
28 def team_member_relation 14 def team_member_relation
29 team_member.users_projects.find_by_project_id(project) 15 team_member.users_projects.find_by_project_id(project)
30 end 16 end
31 -  
32 end 17 end
app/controllers/admin/users_controller.rb
  Diff comments   View file @ee13297
@@ -12,17 +12,6 @@ class Admin::UsersController &lt; Admin::ApplicationController @@ -12,17 +12,6 @@ class Admin::UsersController &lt; Admin::ApplicationController
12 @projects = admin_user.authorized_projects 12 @projects = admin_user.authorized_projects
13 end 13 end
14 14
15 - def team_update  
16 - UsersProject.add_users_into_projects(  
17 - params[:project_ids],  
18 - [admin_user.id],  
19 - params[:project_access]  
20 - )  
21 -  
22 - redirect_to [:admin, admin_user], notice: 'Teams were successfully updated.'  
23 - end  
24 -  
25 -  
26 def new 15 def new
27 @admin_user = User.new.with_defaults 16 @admin_user = User.new.with_defaults
28 end 17 end
app/views/admin/groups/show.html.haml
  Diff comments   View file @ee13297
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 .span6 65 .span6
66 .ui-box 66 .ui-box
67 %h5.title 67 %h5.title
68 - Add user(s): 68 + Add user(s) to the group:
69 .ui-box-body.form-holder 69 .ui-box-body.form-holder
70 %p.light 70 %p.light
71 Read more about project permissions 71 Read more about project permissions
@@ -80,7 +80,8 @@ @@ -80,7 +80,8 @@
80 = submit_tag 'Add users into group', class: "btn btn-create" 80 = submit_tag 'Add users into group', class: "btn btn-create"
81 .ui-box 81 .ui-box
82 %h5.title 82 %h5.title
83 - Users from #{@group.name} Group 83 + %strong #{@group.name}
  84 + Group Members
84 %small 85 %small
85 (#{@group.users_groups.count}) 86 (#{@group.users_groups.count})
86 %ul.well-list.group-users-list 87 %ul.well-list.group-users-list
app/views/admin/projects/members/_form.html.haml
View file @59f75e6
@@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
1 -= form_for @team_member_relation, as: :team_member, url: admin_project_member_path(@project, @member) do |f|  
2 - -if @team_member_relation.errors.any?  
3 - .alert.alert-error  
4 - %ul  
5 - - @team_member_relation.errors.full_messages.each do |msg|  
6 - %li= msg  
7 -  
8 - .clearfix  
9 - %label Project Access:  
10 - .input  
11 - = f.select :project_access, options_for_select(Project.access_options, @team_member_relation.project_access), {}, class: "project-access-select chosen span3"  
12 -  
13 - %br  
14 - .actions  
15 - = f.submit 'Save', class: "btn btn-primary"  
16 - = link_to 'Cancel', :back, class: "btn"  
app/views/admin/projects/members/edit.html.haml
View file @59f75e6
@@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
1 -%p.slead  
2 - Edit access for  
3 - = link_to @member.name, admin_user_path(@member)  
4 - in  
5 - = link_to @project.name_with_namespace, admin_project_path(@project)  
6 -  
7 -%hr  
8 -= render 'form'  
app/views/admin/projects/show.html.haml
  Diff comments   View file @ee13297
@@ -91,12 +91,16 @@ @@ -91,12 +91,16 @@
91 Team 91 Team
92 %small 92 %small
93 (#{@project.users.count}) 93 (#{@project.users.count})
94 - = link_to project_team_index_path(@project), class: "btn btn-tiny" do  
95 - %i.icon-edit  
96 - Edit Team 94 + .pull-right
  95 + = link_to project_team_index_path(@project), class: "btn btn-tiny" do
  96 + %i.icon-edit
  97 + Manage Access
97 %ul.well-list.team_members 98 %ul.well-list.team_members
98 - - @project.users.each do |tm| 99 + - @project.users.each do |user|
99 %li 100 %li
100 %strong 101 %strong
101 - = link_to tm.name, admin_user_path(tm)  
102 - %span.pull-right.light= @project.project_access_human(tm) 102 + = link_to user.name, admin_user_path(user)
  103 + .pull-right
  104 + %span.light= @project.project_access_human(user)
  105 + = link_to admin_project_member_path(@project, user), confirm: remove_from_project_team_message(@project, user), method: :delete, class: "btn btn-small btn-remove" do
  106 + %i.icon-remove
app/views/admin/users/show.html.haml
  Diff comments   View file @ee13297
@@ -63,15 +63,16 @@ @@ -63,15 +63,16 @@
63 %strong 63 %strong
64 = link_to @admin_user.created_by.name, [:admin, @admin_user.created_by] 64 = link_to @admin_user.created_by.name, [:admin, @admin_user.created_by]
65 65
66 - - if @admin_user.owned_groups.present? 66 + - if @admin_user.users_groups.present?
67 .ui-box 67 .ui-box
68 - %h5.title Owned groups: 68 + %h5.title Groups:
69 %ul.well-list 69 %ul.well-list
70 - - @admin_user.groups.each do |group| 70 + - @admin_user.users_groups.each do |user_group|
  71 + - group = user_group.group
71 %li 72 %li
72 %strong= link_to group.name, admin_group_path(group) 73 %strong= link_to group.name, admin_group_path(group)
73 -  
74 - 74 + .pull-right
  75 + %span.light= user_group.human_access
75 76
76 .span6 77 .span6
77 .ui-box 78 .ui-box
@@ -87,16 +88,8 @@ @@ -87,16 +88,8 @@
87 %strong.well-title 88 %strong.well-title
88 = truncate(project.name, length: 45) 89 = truncate(project.name, length: 45)
89 90
90 - - if project.owner == @admin_user  
91 - %span.label.label-info owner  
92 -  
93 - if tm 91 - if tm
94 .pull-right 92 .pull-right
95 - = link_to edit_admin_project_member_path(project, tm.user), class: "btn grouped btn-small" do  
96 - %i.icon-edit  
97 - = link_to admin_project_member_path(project, tm.user), confirm: remove_from_project_team_message(project, @admin_user), method: :delete, class: "btn grouped btn-small btn-remove" do 93 + %span.light= tm.human_access
  94 + = link_to admin_project_member_path(project, tm.user), confirm: remove_from_project_team_message(project, @admin_user), method: :delete, class: "btn btn-small btn-remove" do
98 %i.icon-remove 95 %i.icon-remove
99 -  
100 - .pull-right.light  
101 - = tm.project_access_human  
102 - &nbsp;  
config/routes.rb
  Diff comments   View file @ee13297
@@ -76,16 +76,7 @@ Gitlab::Application.routes.draw do @@ -76,16 +76,7 @@ Gitlab::Application.routes.draw do
76 76
77 resources :groups, constraints: { id: /[^\/]+/ } do 77 resources :groups, constraints: { id: /[^\/]+/ } do
78 member do 78 member do
79 - put :project_update  
80 put :project_teams_update 79 put :project_teams_update
81 - delete :remove_project  
82 - end  
83 - end  
84 -  
85 - resources :teams, constraints: { id: /[^\/]+/ } do  
86 - scope module: :teams do  
87 - resources :members, only: [:edit, :update, :destroy, :new, :create]  
88 - resources :projects, only: [:edit, :update, :destroy, :new, :create], constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }  
89 end 80 end
90 end 81 end
91 82
@@ -98,7 +89,7 @@ Gitlab::Application.routes.draw do @@ -98,7 +89,7 @@ Gitlab::Application.routes.draw do
98 89
99 resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do 90 resources :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ }, only: [:index, :show] do
100 scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do 91 scope module: :projects, constraints: { id: /[a-zA-Z.\/0-9_\-]+/ } do
101 - resources :members, only: [:edit, :update, :destroy] 92 + resources :members, only: [:destroy]
102 end 93 end
103 end 94 end
104 95