Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/…

…zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298

Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/…
…zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
Dmitriy Zaporozhets
2 parents c29457a3 655b836b
Showing 15 changed files with 173 additions and 20 deletions Show diff stats
app/controllers/admin/groups_controller.rb
app/controllers/groups_controller.rb
app/models/group.rb
app/models/project.rb
app/models/users_project.rb
app/views/admin/groups/show.html.haml
app/views/groups/_new_group_member.html.haml
app/views/groups/people.html.haml
config/routes.rb
features/admin/groups.feature
features/group/group.feature
features/steps/admin/admin_groups.rb
features/steps/group/group.rb
features/steps/shared/paths.rb
lib/gitlab/regex.rb
 class Admin::GroupsController < AdminController
-  before_filter :group, only: [:edit, :show, :update, :destroy, :project_update]
+  before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
  
   def index
     @groups = Group.order('name ASC')
@@ -12,6 +12,8 @@ class Admin::GroupsController &lt; AdminController
     @projects = @projects.not_in_group(@group) if @group.projects.present?
     @projects = @projects.all
     @projects.reject!(&:empty_repo?)
+
+    @users = User.active
   end
  
   def new
@@ -65,6 +67,11 @@ class Admin::GroupsController &lt; AdminController
     redirect_to :back, notice: 'Group was successfully updated.'
   end
  
+  def project_teams_update
+    @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
+    redirect_to [:admin, @group], notice: 'Users was successfully added.'
+  end
+
   def destroy
     @group.destroy
  
@@ -53,9 +53,16 @@ class GroupsController &lt; ApplicationController
  
     if @project
       @team_member = @project.users_projects.new
+    else
+      @team_member = UsersProject.new
     end
   end
  
+  def team_members
+    @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
+    redirect_to people_group_path(@group), notice: 'Users was successfully added.'
+  end
+
   protected
  
   def group
@@ -12,6 +12,12 @@
 #
  
 class Group < Namespace
+  def add_users_to_project_teams(user_ids, project_access)
+    projects.each do |project|
+      project.add_users_ids_to_team(user_ids, project_access)
+    end
+  end
+
   def users
     users = User.joins(:users_projects).where(users_projects: {project_id: project_ids})
     users = users << owner
@@ -64,7 +64,9 @@ class Project &lt; ActiveRecord::Base
   # Validations
   validates :owner, presence: true
   validates :description, length: { within: 0..2000 }
-  validates :name, presence: true, length: { within: 0..255 }
+  validates :name, presence: true, length: { within: 0..255 },
+            format: { with: Gitlab::Regex.project_name_regex,
+                      message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
   validates :path, presence: true, length: { within: 0..255 },
             format: { with: Gitlab::Regex.path_regex,
                       message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
@@ -80,6 +82,7 @@ class Project &lt; ActiveRecord::Base
   scope :public_only, where(private_flag: false)
   scope :without_user, ->(user)  { where("id NOT IN (:ids)", ids: user.projects.map(&:id) ) }
   scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
+  scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
   scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
   scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
   scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
@@ -33,6 +33,8 @@ class UsersProject &lt; ActiveRecord::Base
  
   delegate :name, :email, to: :user, prefix: true
  
+  scope :in_project, ->(project) { where(project_id: project.id) }
+
   class << self
     def import_team(source_project, target_project)
       UsersProject.without_repository_callback do
@@ -44,25 +44,56 @@
         %div
           = f.submit 'Change Owner', class: "btn danger"
           = link_to "Cancel", "#", class: "btn change-owner-cancel-link"
-%fieldset
-  %legend Projects (#{@group.projects.count})
-  %table
-    %thead
+
+- if @group.projects.any?
+  %fieldset
+    %legend Projects (#{@group.projects.count})
+    %table
+      %thead
+        %tr
+          %th Project name
+          %th Path
+          %th Users
+          %th.cred Danger Zone!
+      - @group.projects.each do |project|
+        %tr
+          %td
+            = link_to project.name_with_namespace, [:admin, project]
+          %td
+            %span.monospace= project.path_with_namespace + ".git"
+          %td= project.users.count
+          %td.bgred
+            = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
+
+  = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put  do
+    %table.zebra-striped
+      %thead
+        %tr
+          %th Users
+          %th Project Access:
+
+      - @group.users.each do |u|
+        %tr{class: "user_#{u.id}"}
+          %td.name= link_to u.name, admin_user_path(u)
+          %td.projects_access
+            - u.projects.in_namespace(@group).each do |project|
+              - u_p = u.users_projects.in_project(project).first
+              %span
+                = project.name
+                = link_to "(#{ u_p.project_access_human })", edit_admin_team_member_path(u_p)
       %tr
-        %th Project name
-        %th Path
-        %th Users
-        %th.cred Danger Zone!
-    - @group.projects.each do |project|
+        %td.input= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
+        %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}
+
       %tr
+        %td= submit_tag 'Add user to projects in group', class: "btn primary"
         %td
-          = link_to project.name_with_namespace, [:admin, project]
-        %td
-          %span.monospace= project.path_with_namespace + ".git"
-        %td= project.users.count
-        %td.bgred
-          = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
+          Read more about project permissions
+          %strong= link_to "here", help_permissions_path, class: "vlink"
  
+- else
+  %fieldset
+    %legend Group is empty
  
 = form_tag project_update_admin_group_path(@group), class: "bulk_import", method: :put  do
   %fieldset
@@ -0,0 +1,18 @@
+= form_for @team_member, as: :team_member, url: team_members_group_path(@group) do |f|
+  %fieldset
+    %legend= "New Team member(s) for projects in #{@group.name}"
+
+    %h6 1. Choose people you want in the team
+    .clearfix
+      = f.label :user_ids, "People"
+      .input= select_tag(:user_ids, options_from_collection_for_select(User.active, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
+
+    %h6 2. Set access level for them
+    .clearfix
+      = f.label :project_access, "Project Access"
+      .input= select_tag :project_access, options_for_select(Project.access_options, @team_member.project_access), class: "project-access-select chosen"
+
+    .form-actions
+      = hidden_field_tag :redirect_to, people_group_path(@group)
+      = f.submit 'Add', class: "btn save-btn"
+
@@ -2,8 +2,8 @@
   .span3
     = render 'people_filter'
   .span9
-    - if @project && can?(current_user, :manage_group, @group)
-      = render "new_member"
+    - if can?(current_user, :manage_group, @group)
+      = render (@project ? "new_member" : "new_group_member")
     .ui-box
       %h5
         Team
@@ -47,6 +47,7 @@ Gitlab::Application.routes.draw do
     resources :groups, constraints: { id: /[^\/]+/ } do
       member do
         put :project_update
+        put :project_teams_update
         delete :remove_project
       end
     end
@@ -102,6 +103,7 @@ Gitlab::Application.routes.draw do
       get :merge_requests
       get :search
       get :people
+      post :team_members
     end
   end
  
 Feature: Admin Groups
   Background:
     Given I sign in as an admin
+    And I have group with projects
+    And Create gitlab user "John"
     And I visit admin groups page
  
   Scenario: Create a group
@@ -8,3 +10,8 @@ Feature: Admin Groups
     And submit form with new group info
     Then I should be redirected to group page
     And I should see newly created group
+
+  Scenario: Add user into projects in group
+    When I visit admin group page
+    When I select user "John" from user list as "Reporter"
+    Then I should see "John" in team list in every project as "Reporter"
@@ -17,3 +17,9 @@ Feature: Groups
     Given project from group has merge requests assigned to me
     When I visit group merge requests page
     Then I should see merge requests from this group assigned to me
+
+  Scenario: I should add user to projects in Group
+    Given I have new user "John"
+    When I visit group people page
+    And I select user "John" from list with role "Reporter"
+    Then I should see user "John" in team list
@@ -3,10 +3,26 @@ class AdminGroups &lt; Spinach::FeatureSteps
   include SharedPaths
   include SharedActiveTab
  
+  When 'I visit admin group page' do
+    visit admin_group_path(current_group)
+  end
+
   When 'I click new group link' do
     click_link "New Group"
   end
  
+  And 'I have group with projects' do
+    @group   = create(:group)
+    @project = create(:project, group: @group)
+    @event   = create(:closed_issue_event, project: @project)
+
+    @project.add_access current_user, :admin
+  end
+
+  And 'Create gitlab user "John"' do
+    create(:user, :name => "John")
+  end
+
   And 'submit form with new group info' do
     fill_in 'group_name', :with => 'gitlab'
     click_button "Create group"
@@ -19,5 +35,27 @@ class AdminGroups &lt; Spinach::FeatureSteps
   Then 'I should be redirected to group page' do
     current_path.should == admin_group_path(Group.last)
   end
+
+  When 'I select user "John" from user list as "Reporter"' do
+    user = User.find_by_name("John")
+    within "#new_team_member" do
+      select user.name, :from => "user_ids"
+      select "Reporter", :from => "project_access"
+    end
+    click_button "Add user to projects in group"
+  end
+
+  Then 'I should see "John" in team list in every project as "Reporter"' do
+    user = User.find_by_name("John")
+    projects_with_access = find(".user_#{user.id} .projects_access")
+    projects_with_access.should have_link("Reporter")
+  end
+
+  protected
+
+  def current_group
+    @group ||= Group.first
+  end
+
 end
  
@@ -9,7 +9,7 @@ class Groups &lt; Spinach::FeatureSteps
   end
  
   And 'I have group with projects' do
-    @group   = create(:group)
+    @group   = create(:group, owner: current_user)
     @project = create(:project, group: @group)
     @event   = create(:closed_issue_event, project: @project)
  
@@ -32,6 +32,24 @@ class Groups &lt; Spinach::FeatureSteps
     end
   end
  
+  Given 'I have new user "John"' do
+    create(:user, name: "John")
+  end
+
+  And 'I select user "John" from list with role "Reporter"' do
+    user = User.find_by_name("John")
+    within "#new_team_member" do
+      select user.name, :from => "user_ids"
+      select "Reporter", :from => "project_access"
+    end
+    click_button "Add"
+  end
+
+  Then 'I should see user "John" in team list' do
+    projects_with_access = find(".ui-box .well-list")
+    projects_with_access.should have_content("John")
+  end
+
   Given 'project from group has issues assigned to me' do
     create :issue,
       project: project,
@@ -21,6 +21,10 @@ module SharedPaths
     visit merge_requests_group_path(current_group)
   end
  
+  When 'I visit group people page' do
+    visit people_group_path(current_group)
+  end
+
   # ----------------------------------------
   # Dashboard
   # ----------------------------------------
@@ -6,6 +6,10 @@ module Gitlab
       default_regex
     end
  
+    def project_name_regex
+      default_regex
+    end
+
     def path_regex
       default_regex
     end
1	1	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, :project_teams_update]
3	3
4	4	def index
5	5	@groups = Group.order('name ASC')
...	...	@@ -12,6 +12,8 @@ class Admin::GroupsController < AdminController
12	12	@projects = @projects.not_in_group(@group) if @group.projects.present?
13	13	@projects = @projects.all
14	14	@projects.reject!(&:empty_repo?)
	15	+
	16	+ @users = User.active
15	17	end
16	18
17	19	def new
...	...	@@ -65,6 +67,11 @@ class Admin::GroupsController < AdminController
65	67	redirect_to :back, notice: 'Group was successfully updated.'
66	68	end
67	69
	70	+ def project_teams_update
	71	+ @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
	72	+ redirect_to [:admin, @group], notice: 'Users was successfully added.'
	73	+ end
	74	+
68	75	def destroy
69	76	@group.destroy
70	77
...	...
...	...	@@ -53,9 +53,16 @@ class GroupsController < ApplicationController
53	53
54	54	if @project
55	55	@team_member = @project.users_projects.new
	56	+ else
	57	+ @team_member = UsersProject.new
56	58	end
57	59	end
58	60
	61	+ def team_members
	62	+ @group.add_users_to_project_teams(params[:user_ids], params[:project_access])
	63	+ redirect_to people_group_path(@group), notice: 'Users was successfully added.'
	64	+ end
	65	+
59	66	protected
60	67
61	68	def group
...	...
...	...	@@ -12,6 +12,12 @@
12	12	#
13	13
14	14	class Group < Namespace
	15	+ def add_users_to_project_teams(user_ids, project_access)
	16	+ projects.each do \|project\|
	17	+ project.add_users_ids_to_team(user_ids, project_access)
	18	+ end
	19	+ end
	20	+
15	21	def users
16	22	users = User.joins(:users_projects).where(users_projects: {project_id: project_ids})
17	23	users = users << owner
...	...
...	...	@@ -64,7 +64,9 @@ class Project < ActiveRecord::Base
64	64	# Validations
65	65	validates :owner, presence: true
66	66	validates :description, length: { within: 0..2000 }
67		- validates :name, presence: true, length: { within: 0..255 }
	67	+ validates :name, presence: true, length: { within: 0..255 },
	68	+ format: { with: Gitlab::Regex.project_name_regex,
	69	+ message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
68	70	validates :path, presence: true, length: { within: 0..255 },
69	71	format: { with: Gitlab::Regex.path_regex,
70	72	message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
...	...	@@ -80,6 +82,7 @@ class Project < ActiveRecord::Base
80	82	scope :public_only, where(private_flag: false)
81	83	scope :without_user, ->(user) { where("id NOT IN (:ids)", ids: user.projects.map(&:id) ) }
82	84	scope :not_in_group, ->(group) { where("id NOT IN (:ids)", ids: group.project_ids ) }
	85	+ scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
83	86	scope :sorted_by_activity, ->() { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
84	87	scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
85	88	scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
...	...
...	...	@@ -33,6 +33,8 @@ class UsersProject < ActiveRecord::Base
33	33
34	34	delegate :name, :email, to: :user, prefix: true
35	35
	36	+ scope :in_project, ->(project) { where(project_id: project.id) }
	37	+
36	38	class << self
37	39	def import_team(source_project, target_project)
38	40	UsersProject.without_repository_callback do
...	...
...	...	@@ -44,25 +44,56 @@
44	44	%div
45	45	= f.submit 'Change Owner', class: "btn danger"
46	46	= link_to "Cancel", "#", class: "btn change-owner-cancel-link"
47		-%fieldset
48		- %legend Projects (#{@group.projects.count})
49		- %table
50		- %thead
	47	+
	48	+- if @group.projects.any?
	49	+ %fieldset
	50	+ %legend Projects (#{@group.projects.count})
	51	+ %table
	52	+ %thead
	53	+ %tr
	54	+ %th Project name
	55	+ %th Path
	56	+ %th Users
	57	+ %th.cred Danger Zone!
	58	+ - @group.projects.each do \|project\|
	59	+ %tr
	60	+ %td
	61	+ = link_to project.name_with_namespace, [:admin, project]
	62	+ %td
	63	+ %span.monospace= project.path_with_namespace + ".git"
	64	+ %td= project.users.count
	65	+ %td.bgred
	66	+ = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
	67	+
	68	+ = form_tag project_teams_update_admin_group_path(@group), id: "new_team_member", class: "bulk_import", method: :put do
	69	+ %table.zebra-striped
	70	+ %thead
	71	+ %tr
	72	+ %th Users
	73	+ %th Project Access:
	74	+
	75	+ - @group.users.each do \|u\|
	76	+ %tr{class: "user_#{u.id}"}
	77	+ %td.name= link_to u.name, admin_user_path(u)
	78	+ %td.projects_access
	79	+ - u.projects.in_namespace(@group).each do \|project\|
	80	+ - u_p = u.users_projects.in_project(project).first
	81	+ %span
	82	+ = project.name
	83	+ = link_to "(#{ u_p.project_access_human })", edit_admin_team_member_path(u_p)
51	84	%tr
52		- %th Project name
53		- %th Path
54		- %th Users
55		- %th.cred Danger Zone!
56		- - @group.projects.each do \|project\|
	85	+ %td.input= select_tag :user_ids, options_from_collection_for_select(@users , :id, :name), multiple: true, data: {placeholder: 'Select users'}, class: 'chosen span5'
	86	+ %td= select_tag :project_access, options_for_select(Project.access_options), {class: "project-access-select chosen span3"}
	87	+
57	88	%tr
	89	+ %td= submit_tag 'Add user to projects in group', class: "btn primary"
58	90	%td
59		- = link_to project.name_with_namespace, [:admin, project]
60		- %td
61		- %span.monospace= project.path_with_namespace + ".git"
62		- %td= project.users.count
63		- %td.bgred
64		- = link_to 'Transfer project to global namespace', remove_project_admin_group_path(@group, project_id: project.id), confirm: 'Remove project from group and move to global namespace. Are you sure?', method: :delete, class: "btn danger small"
	91	+ Read more about project permissions
	92	+ %strong= link_to "here", help_permissions_path, class: "vlink"
65	93
	94	+- else
	95	+ %fieldset
	96	+ %legend Group is empty
66	97
67	98	= form_tag project_update_admin_group_path(@group), class: "bulk_import", method: :put do
68	99	%fieldset
...	...
...	...	@@ -0,0 +1,18 @@
	1	+= form_for @team_member, as: :team_member, url: team_members_group_path(@group) do \|f\|
	2	+ %fieldset
	3	+ %legend= "New Team member(s) for projects in #{@group.name}"
	4	+
	5	+ %h6 1. Choose people you want in the team
	6	+ .clearfix
	7	+ = f.label :user_ids, "People"
	8	+ .input= select_tag(:user_ids, options_from_collection_for_select(User.active, :id, :name), {data: {placeholder: "Select users"}, class: "chosen xxlarge", multiple: true})
	9	+
	10	+ %h6 2. Set access level for them
	11	+ .clearfix
	12	+ = f.label :project_access, "Project Access"
	13	+ .input= select_tag :project_access, options_for_select(Project.access_options, @team_member.project_access), class: "project-access-select chosen"
	14	+
	15	+ .form-actions
	16	+ = hidden_field_tag :redirect_to, people_group_path(@group)
	17	+ = f.submit 'Add', class: "btn save-btn"
	18	+
...	...
...	...	@@ -2,8 +2,8 @@
2	2	.span3
3	3	= render 'people_filter'
4	4	.span9
5		- - if @project && can?(current_user, :manage_group, @group)
6		- = render "new_member"
	5	+ - if can?(current_user, :manage_group, @group)
	6	+ = render (@project ? "new_member" : "new_group_member")
7	7	.ui-box
8	8	%h5
9	9	Team
...	...
...	...	@@ -47,6 +47,7 @@ Gitlab::Application.routes.draw do
47	47	resources :groups, constraints: { id: /[^\/]+/ } do
48	48	member do
49	49	put :project_update
	50	+ put :project_teams_update
50	51	delete :remove_project
51	52	end
52	53	end
...	...	@@ -102,6 +103,7 @@ Gitlab::Application.routes.draw do
102	103	get :merge_requests
103	104	get :search
104	105	get :people
	106	+ post :team_members
105	107	end
106	108	end
107	109
...	...
1	1	Feature: Admin Groups
2	2	Background:
3	3	Given I sign in as an admin
	4	+ And I have group with projects
	5	+ And Create gitlab user "John"
4	6	And I visit admin groups page
5	7
6	8	Scenario: Create a group
...	...	@@ -8,3 +10,8 @@ Feature: Admin Groups
8	10	And submit form with new group info
9	11	Then I should be redirected to group page
10	12	And I should see newly created group
	13	+
	14	+ Scenario: Add user into projects in group
	15	+ When I visit admin group page
	16	+ When I select user "John" from user list as "Reporter"
	17	+ Then I should see "John" in team list in every project as "Reporter"
...	...