diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index c82edb4c168bc09476e0decc879ad95423bcff05..1b16d706c1e096e5aa528c9290121929d9ca56c0 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -53,9 +53,18 @@ class GroupsController < 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 diff --git a/app/views/groups/_new_group_member.html.haml b/app/views/groups/_new_group_member.html.haml new file mode 100644 index 0000000000000000000000000000000000000000..b4fc07d2ae9019f9888b52d4b012d812fc4ef203 --- /dev/null +++ b/app/views/groups/_new_group_member.html.haml @@ -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" + diff --git a/app/views/groups/people.html.haml b/app/views/groups/people.html.haml index be3dd7a4d7872cd048dff8ab9b46e1333643ef9f..6965f83562947a08e56e4400092b4f85b093e0d7 100644 --- a/app/views/groups/people.html.haml +++ b/app/views/groups/people.html.haml @@ -17,4 +17,4 @@ %span.cgray= user.email - if @group.owner == user %span.btn.btn-small.disabled.right Group Owner - + = render "new_group_member" diff --git a/config/routes.rb b/config/routes.rb index 659d1a04b554795138ee6220a4955ec4de03631d..90ae2514e63793e1b9cf63f8e1eff9c100c6ef8f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -103,6 +103,7 @@ Gitlab::Application.routes.draw do get :merge_requests get :search get :people + put :team_members end end diff --git a/features/group/group.feature b/features/group/group.feature index 073081122704a105060a16c2b37e1392eccb03f7..4b8483bd36195d132b268b09aefc8d85d4fe2379 100644 --- a/features/group/group.feature +++ b/features/group/group.feature @@ -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 diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 4de260ec33e35a72d913552e7317e7bf2eb0320b..036938520727aacfb0993ffc687c4a4c77a2dab4 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -32,6 +32,25 @@ class Groups < 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, diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb index a12576288dfa7e2fca7cbce454d44edec613458a..bd43ba6b3dc21a2cc69926961719bfe853b47339 100644 --- a/features/steps/shared/paths.rb +++ b/features/steps/shared/paths.rb @@ -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 # ----------------------------------------