Download as
Browse Code »

Commit 48019f1a0fa884c1a8439848fe0dd1d6bc8588cc

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

Update admin area with new group memberships

Showing 3 changed files with 22 additions and 23 deletions   Show diff stats
app/controllers/admin/groups_controller.rb
  Diff comments   View file @48019f1
... ... @@ -66,14 +66,12 @@ class Admin::GroupsController < Admin::ApplicationController
66 66 end
67 67  
68 68 def project_teams_update
69   - @group.add_users_to_project_teams(params[:user_ids].split(','), params[:project_access])
  69 + @group.add_users(params[:user_ids].split(','), params[:group_access])
70 70  
71 71 redirect_to [:admin, @group], notice: 'Users were successfully added.'
72 72 end
73 73  
74 74 def destroy
75   - @group.truncate_teams
76   -
77 75 @group.destroy
78 76  
79 77 redirect_to admin_groups_path, notice: 'Group was successfully deleted.'
... ...
app/controllers/users_controller.rb
  Diff comments   View file @48019f1
... ... @@ -3,7 +3,7 @@ class UsersController < ApplicationController
3 3  
4 4 def show
5 5 @user = User.find_by_username!(params[:username])
6   - @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
  6 + @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id)).order('namespace_id DESC')
7 7 @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
8 8  
9 9 @title = @user.name
... ...
app/views/admin/groups/show.html.haml
  Diff comments   View file @48019f1
... ... @@ -49,10 +49,23 @@
49 49 %strong
50 50 = @group.created_at.stamp("March 1, 1999")
51 51  
  52 + .ui-box
  53 + %h5.title
  54 + Projects
  55 + %small
  56 + (#{@group.projects.count})
  57 + %ul.well-list
  58 + - @group.projects.sort_by(&:name).each do |project|
  59 + %li
  60 + %strong
  61 + = link_to project.name_with_namespace, [:admin, project]
  62 + %span.pull-right.light
  63 + %span.monospace= project.path_with_namespace + ".git"
52 64  
  65 + .span6
53 66 .ui-box
54 67 %h5.title
55   - Add user to Group projects:
  68 + Add user to the group:
56 69 .ui-box-body.form-holder
57 70 %p.light
58 71 Read more about project permissions
... ... @@ -64,30 +77,18 @@
64 77 %div.prepend-top-10
65 78 = select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span2"}
66 79 %hr
67   - = submit_tag 'Add user to projects in group', class: "btn btn-create"
  80 + = submit_tag 'Add user to the group', class: "btn btn-create"
68 81 .ui-box
69 82 %h5.title
70   - Users from Group projects
  83 + Users from #{@group.name} Group
71 84 %small
72   - (#{@group.users.count})
  85 + (#{@group.users_groups.count})
73 86 %ul.well-list
74   - - @group.users.sort_by(&:name).each do |user|
  87 + - @group.users_groups.order('group_access DESC').each do |member|
  88 + - user = member.user
75 89 %li{class: dom_class(user)}
76 90 %strong
77 91 = link_to user.name, admin_user_path(user)
78 92 %span.pull-right.light
79   - = pluralize user.authorized_projects.in_namespace(@group).count, 'project'
  93 + = member.human_access
80 94  
81   - .span6
82   - .ui-box
83   - %h5.title
84   - Projects
85   - %small
86   - (#{@group.projects.count})
87   - %ul.well-list
88   - - @group.projects.sort_by(&:name).each do |project|
89   - %li
90   - %strong
91   - = link_to project.name_with_namespace, [:admin, project]
92   - %span.pull-right.light
93   - %span.monospace= project.path_with_namespace + ".git"
... ...