Add functional in user section

Andrey Kumanyaev
1 parent 9c574464
Showing 7 changed files with 59 additions and 1 deletions Show diff stats
app/controllers/groups_controller.rb
app/views/groups/_new_group_member.html.haml
app/views/groups/people.html.haml
config/routes.rb
features/group/group.feature
features/steps/group/group.rb
features/steps/shared/paths.rb
@@ -53,9 +53,18 @@ class GroupsController &lt; ApplicationController
  
     if @project
       @team_member = @project.users_projects.new
+    else
+      @team_member = UsersProject.new
     end
   end
  
+  def team_members
+    @group.projects.each do |p|
+      p.add_users_ids_to_team(params[:user_ids], params[:project_access])
+    end
+    redirect_to people_group_path(@group), notice: 'Users was successfully added.'
+  end
+
   protected
  
   def group
@@ -0,0 +1,18 @@
+= form_for @team_member, as: :team_member, url: team_members_group_path(@group, @team_member) 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"
+
@@ -17,4 +17,4 @@
             %span.cgray= user.email
             - if @group.owner == user
               %span.btn.btn-small.disabled.right Group Owner
-
+    = render "new_group_member"
@@ -103,6 +103,7 @@ Gitlab::Application.routes.draw do
       get :merge_requests
       get :search
       get :people
+      put :team_members
     end
   end
  
@@ -17,3 +17,10 @@ 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 page
+    When I visit group people page
+    When I select user "John" from list with role "Reporter"
+    Then I should see user "John" in team list
@@ -32,6 +32,25 @@ class Groups &lt; Spinach::FeatureSteps
     end
   end
  
+  Given 'I have new user "John"' do
+    create(:user, name: "John")
+  end
+
+  When '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
+    user = User.find_by_name("John")
+    projects_with_access = find(".ui-box .well-list li")
+    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
   # ----------------------------------------
...	...	@@ -53,9 +53,18 @@ 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.projects.each do \|p\|
	63	+ p.add_users_ids_to_team(params[:user_ids], params[:project_access])
	64	+ end
	65	+ redirect_to people_group_path(@group), notice: 'Users was successfully added.'
	66	+ end
	67	+
59	68	protected
60	69
61	70	def group
...	...
...	...	@@ -0,0 +1,18 @@
	1	+= form_for @team_member, as: :team_member, url: team_members_group_path(@group, @team_member) 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	+
...	...
...	...	@@ -17,4 +17,4 @@
17	17	%span.cgray= user.email
18	18	- if @group.owner == user
19	19	%span.btn.btn-small.disabled.right Group Owner
20		-
	20	+ = render "new_group_member"
...	...
...	...	@@ -103,6 +103,7 @@ Gitlab::Application.routes.draw do
103	103	get :merge_requests
104	104	get :search
105	105	get :people
	106	+ put :team_members
106	107	end
107	108	end
108	109
...	...
...	...	@@ -17,3 +17,10 @@ Feature: Groups
17	17	Given project from group has merge requests assigned to me
18	18	When I visit group merge requests page
19	19	Then I should see merge requests from this group assigned to me
	20	+
	21	+ Scenario: I should add user to projects in Group
	22	+ Given I have new user "John"
	23	+ When I visit group page
	24	+ When I visit group people page
	25	+ When I select user "John" from list with role "Reporter"
	26	+ Then I should see user "John" in team list
...	...
...	...	@@ -32,6 +32,25 @@ class Groups < Spinach::FeatureSteps
32	32	end
33	33	end
34	34
	35	+ Given 'I have new user "John"' do
	36	+ create(:user, name: "John")
	37	+ end
	38	+
	39	+ When 'I select user "John" from list with role "Reporter"' do
	40	+ user = User.find_by_name("John")
	41	+ within "#new_team_member" do
	42	+ select user.name, :from => "user_ids"
	43	+ select "Reporter", :from => "project_access"
	44	+ end
	45	+ click_button "Add"
	46	+ end
	47	+
	48	+ Then 'I should see user "John" in team list' do
	49	+ user = User.find_by_name("John")
	50	+ projects_with_access = find(".ui-box .well-list li")
	51	+ projects_with_access.should have_content("John")
	52	+ end
	53	+
35	54	Given 'project from group has issues assigned to me' do
36	55	create :issue,
37	56	project: project,
...	...
...	...	@@ -21,6 +21,10 @@ module SharedPaths
21	21	visit merge_requests_group_path(current_group)
22	22	end
23	23
	24	+ When 'I visit group people page' do
	25	+ visit people_group_path(current_group)
	26	+ end
	27	+
24	28	# ----------------------------------------
25	29	# Dashboard
26	30	# ----------------------------------------
...	...