Update admin area with new group memberships

Dmitriy Zaporozhets
1 parent a0b6c964
Showing 3 changed files with 22 additions and 23 deletions Show diff stats
app/controllers/admin/groups_controller.rb
app/controllers/users_controller.rb
app/views/admin/groups/show.html.haml
@@ -66,14 +66,12 @@ class Admin::GroupsController &lt; Admin::ApplicationController
   end
   def project_teams_update
-    @group.add_users_to_project_teams(params[:user_ids].split(','), params[:project_access])
+    @group.add_users(params[:user_ids].split(','), params[:group_access])
     redirect_to [:admin, @group], notice: 'Users were successfully added.'
   end
   def destroy
-    @group.truncate_teams
-
     @group.destroy
     redirect_to admin_groups_path, notice: 'Group was successfully deleted.'
@@ -3,7 +3,7 @@ class UsersController &lt; ApplicationController
   def show
     @user = User.find_by_username!(params[:username])
-    @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id))
+    @projects = @user.authorized_projects.where('projects.id in (?)', current_user.authorized_projects.map(&:id)).order('namespace_id DESC')
     @events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
     @title = @user.name
@@ -49,10 +49,23 @@
           %strong
             = @group.created_at.stamp("March 1, 1999")
+    .ui-box
+      %h5.title
+        Projects
+        %small
+          (#{@group.projects.count})
+      %ul.well-list
+        - @group.projects.sort_by(&:name).each do |project|
+          %li
+            %strong
+              = link_to project.name_with_namespace, [:admin, project]
+            %span.pull-right.light
+              %span.monospace= project.path_with_namespace + ".git"
+  .span6
     .ui-box
       %h5.title
-        Add user to Group projects:
+        Add user to the group:
       .ui-box-body.form-holder
         %p.light
           Read more about project permissions
@@ -64,30 +77,18 @@
           %div.prepend-top-10
             = select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span2"}
           %hr
-          = submit_tag 'Add user to projects in group', class: "btn btn-create"
+          = submit_tag 'Add user to the group', class: "btn btn-create"
     .ui-box
       %h5.title
-        Users from Group projects
+        Users from #{@group.name} Group
         %small
-          (#{@group.users.count})
+          (#{@group.users_groups.count})
       %ul.well-list
-        - @group.users.sort_by(&:name).each do |user|
+        - @group.users_groups.order('group_access DESC').each do |member|
+          - user = member.user
           %li{class: dom_class(user)}
             %strong
               = link_to user.name, admin_user_path(user)
             %span.pull-right.light
-              = pluralize user.authorized_projects.in_namespace(@group).count, 'project'
+              = member.human_access
-  .span6
-    .ui-box
-      %h5.title
-        Projects
-        %small
-          (#{@group.projects.count})
-      %ul.well-list
-        - @group.projects.sort_by(&:name).each do |project|
-          %li
-            %strong
-              = link_to project.name_with_namespace, [:admin, project]
-            %span.pull-right.light
-              %span.monospace= project.path_with_namespace + ".git"
	@@ -3,7 +3,7 @@ class UsersController < ApplicationController		@@ -3,7 +3,7 @@ class UsersController < ApplicationController
3		3
4	def show	4	def show
5	@user = User.find_by_username!(params[:username])	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	@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)	7	@events = @user.recent_events.where(project_id: @projects.map(&:id)).limit(20)
8		8
9	@title = @user.name	9	@title = @user.name