Commit dc038a71 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Rename Group#people to Group#members

parent 3232f547
......@@ -30,7 +30,7 @@ class Dispatcher
new Wall(project_id)
when 'projects:teams:members:index'
new TeamMembers()
when 'groups:people'
when 'groups:members'
new GroupMembers()
when 'projects:tree:show'
new TreeView()
......
......@@ -61,7 +61,7 @@ class GroupsController < ApplicationController
end
end
def people
def members
@project = group.projects.find(params[:project_id]) if params[:project_id]
@members = group.users_groups.order('group_access DESC')
@users_group = UsersGroup.new
......
......@@ -9,7 +9,7 @@ class UsersGroupsController < ApplicationController
def create
@group.add_users(params[:user_ids].split(','), params[:group_access])
redirect_to people_group_path(@group), notice: 'Users were successfully added.'
redirect_to members_group_path(@group), notice: 'Users were successfully added.'
end
def update
......@@ -21,7 +21,7 @@ class UsersGroupsController < ApplicationController
@users_group.destroy unless @users_group.user == @group.owner
respond_to do |format|
format.html { redirect_to people_group_path(@group), notice: 'User was successfully removed from group.' }
format.html { redirect_to members_group_path(@group), notice: 'User was successfully removed from group.' }
format.js { render nothing: true }
end
end
......
......@@ -2,7 +2,7 @@
%fieldset
%legend= "New Group member(s) for #{@group.name}"
%h6 1. Choose people you want in the group
%h6 1. Choose users you want in the group
.clearfix
= f.label :user_ids, "People"
.input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
......@@ -13,6 +13,5 @@
.input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
.form-actions
= hidden_field_tag :redirect_to, people_group_path(@group)
= f.submit 'Add users into group', class: "btn btn-create"
......@@ -10,7 +10,8 @@
.span6
.ui-box
%h5.title
#{@group.name} Group Members
%strong #{@group.name}
Group Members
%small
(#{@members.count})
%ul.well-list
......
......@@ -10,8 +10,8 @@
= link_to merge_requests_group_path(@group) do
Merge Requests
%span.count= current_user.cared_merge_requests.opened.of_group(@group).count
= nav_link(path: 'groups#people') do
= link_to "People", people_group_path(@group)
= nav_link(path: 'groups#members') do
= link_to "Members", members_group_path(@group)
- if can?(current_user, :manage_group, @group)
= nav_link(path: 'groups#edit') do
......
......@@ -3,7 +3,7 @@
%strong #{@group.name} Group
members (#{@group.users_groups.count})
.pull-right
= link_to people_group_path(@group), class: 'btn btn-small' do
= link_to members_group_path(@group), class: 'btn btn-small' do
%i.icon-edit
%ul.well-list
- @group.users_groups.order('group_access DESC').each do |member|
......
......@@ -146,7 +146,7 @@ Gitlab::Application.routes.draw do
member do
get :issues
get :merge_requests
get :people
get :members
end
resources :users_groups, only: [:create, :update, :destroy]
......
......@@ -22,7 +22,7 @@ Feature: Groups
@javascript
Scenario: I should add user to projects in Group
Given I have new user "John"
When I visit group people page
When I visit group members page
And I select user "John" from list with role "Reporter"
Then I should see user "John" in team list
......
......@@ -21,8 +21,8 @@ module SharedPaths
visit merge_requests_group_path(current_group)
end
step 'I visit group people page' do
visit people_group_path(current_group)
step 'I visit group members page' do
visit members_group_path(current_group)
end
step 'I visit group settings page' do
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment