Rename Group#people to Group#members

Dmitriy Zaporozhets
1 parent 3232f547
Showing 11 changed files with 33 additions and 33 deletions Show diff stats
app/assets/javascripts/dispatcher.js.coffee
app/controllers/groups_controller.rb
app/controllers/users_groups_controller.rb
app/views/groups/_new_group_member.html.haml
app/views/groups/members.html.haml
app/views/groups/people.html.haml
app/views/layouts/nav/_group.html.haml
app/views/projects/team_members/_group_members.html.haml
config/routes.rb
features/group/group.feature
features/steps/shared/paths.rb
@@ -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 &lt; 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 &lt; 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 &lt; 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"
  
@@ -0,0 +1,21 @@
+- can_manage_group =  current_user.can? :manage_group, @group
+.row
+  .span6
+    - if can_manage_group
+      = render "new_group_member"
+    - else
+      .light-well
+        %h4.nothing_here_message
+          Only group owners can manage group members
+  .span6
+    .ui-box
+      %h5.title
+        %strong #{@group.name}
+        Group Members
+        %small
+          (#{@members.count})
+      %ul.well-list
+        - @members.each do |member|
+          = render 'users_groups/users_group', member: member, show_controls: can_manage_group
+    %p.light
+      Group members get access to all projects in this group
@@ -1,20 +0,0 @@
-- can_manage_group =  current_user.can? :manage_group, @group
-.row
-  .span6
-    - if can_manage_group
-      = render "new_group_member"
-    - else
-      .light-well
-        %h4.nothing_here_message
-          Only group owners can manage group members
-  .span6
-    .ui-box
-      %h5.title
-        #{@group.name} Group Members
-        %small
-          (#{@members.count})
-      %ul.well-list
-        - @members.each do |member|
-          = render 'users_groups/users_group', member: member, show_controls: can_manage_group
-    %p.light
-      Group members get access to all projects in this group
@@ -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
...	...	@@ -30,7 +30,7 @@ class Dispatcher
30	30	new Wall(project_id)
31	31	when 'projects:teams:members:index'
32	32	new TeamMembers()
33		- when 'groups:people'
	33	+ when 'groups:members'
34	34	new GroupMembers()
35	35	when 'projects:tree:show'
36	36	new TreeView()
...	...
...	...	@@ -61,7 +61,7 @@ class GroupsController < ApplicationController
61	61	end
62	62	end
63	63
64		- def people
	64	+ def members
65	65	@project = group.projects.find(params[:project_id]) if params[:project_id]
66	66	@members = group.users_groups.order('group_access DESC')
67	67	@users_group = UsersGroup.new
...	...
...	...	@@ -9,7 +9,7 @@ class UsersGroupsController < ApplicationController
9	9	def create
10	10	@group.add_users(params[:user_ids].split(','), params[:group_access])
11	11
12		- redirect_to people_group_path(@group), notice: 'Users were successfully added.'
	12	+ redirect_to members_group_path(@group), notice: 'Users were successfully added.'
13	13	end
14	14
15	15	def update
...	...	@@ -21,7 +21,7 @@ class UsersGroupsController < ApplicationController
21	21	@users_group.destroy unless @users_group.user == @group.owner
22	22
23	23	respond_to do \|format\|
24		- format.html { redirect_to people_group_path(@group), notice: 'User was successfully removed from group.' }
	24	+ format.html { redirect_to members_group_path(@group), notice: 'User was successfully removed from group.' }
25	25	format.js { render nothing: true }
26	26	end
27	27	end
...	...
...	...	@@ -2,7 +2,7 @@
2	2	%fieldset
3	3	%legend= "New Group member(s) for #{@group.name}"
4	4
5		- %h6 1. Choose people you want in the group
	5	+ %h6 1. Choose users you want in the group
6	6	.clearfix
7	7	= f.label :user_ids, "People"
8	8	.input= users_select_tag(:user_ids, multiple: true, class: 'input-large')
...	...	@@ -13,6 +13,5 @@
13	13	.input= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select chosen"
14	14
15	15	.form-actions
16		- = hidden_field_tag :redirect_to, people_group_path(@group)
17	16	= f.submit 'Add users into group', class: "btn btn-create"
18	17
...	...
...	...	@@ -0,0 +1,21 @@
	1	+- can_manage_group = current_user.can? :manage_group, @group
	2	+.row
	3	+ .span6
	4	+ - if can_manage_group
	5	+ = render "new_group_member"
	6	+ - else
	7	+ .light-well
	8	+ %h4.nothing_here_message
	9	+ Only group owners can manage group members
	10	+ .span6
	11	+ .ui-box
	12	+ %h5.title
	13	+ %strong #{@group.name}
	14	+ Group Members
	15	+ %small
	16	+ (#{@members.count})
	17	+ %ul.well-list
	18	+ - @members.each do \|member\|
	19	+ = render 'users_groups/users_group', member: member, show_controls: can_manage_group
	20	+ %p.light
	21	+ Group members get access to all projects in this group
...	...
...	...	@@ -1,20 +0,0 @@
1		-- can_manage_group = current_user.can? :manage_group, @group
2		-.row
3		- .span6
4		- - if can_manage_group
5		- = render "new_group_member"
6		- - else
7		- .light-well
8		- %h4.nothing_here_message
9		- Only group owners can manage group members
10		- .span6
11		- .ui-box
12		- %h5.title
13		- #{@group.name} Group Members
14		- %small
15		- (#{@members.count})
16		- %ul.well-list
17		- - @members.each do \|member\|
18		- = render 'users_groups/users_group', member: member, show_controls: can_manage_group
19		- %p.light
20		- Group members get access to all projects in this group
...	...	@@ -10,8 +10,8 @@
10	10	= link_to merge_requests_group_path(@group) do
11	11	Merge Requests
12	12	%span.count= current_user.cared_merge_requests.opened.of_group(@group).count
13		- = nav_link(path: 'groups#people') do
14		- = link_to "People", people_group_path(@group)
	13	+ = nav_link(path: 'groups#members') do
	14	+ = link_to "Members", members_group_path(@group)
15	15
16	16	- if can?(current_user, :manage_group, @group)
17	17	= nav_link(path: 'groups#edit') do
...	...
...	...	@@ -3,7 +3,7 @@
3	3	%strong #{@group.name} Group
4	4	members (#{@group.users_groups.count})
5	5	.pull-right
6		- = link_to people_group_path(@group), class: 'btn btn-small' do
	6	+ = link_to members_group_path(@group), class: 'btn btn-small' do
7	7	%i.icon-edit
8	8	%ul.well-list
9	9	- @group.users_groups.order('group_access DESC').each do \|member\|
...	...
...	...	@@ -146,7 +146,7 @@ Gitlab::Application.routes.draw do
146	146	member do
147	147	get :issues
148	148	get :merge_requests
149		- get :people
	149	+ get :members
150	150	end
151	151
152	152	resources :users_groups, only: [:create, :update, :destroy]
...	...
...	...	@@ -22,7 +22,7 @@ Feature: Groups
22	22	@javascript
23	23	Scenario: I should add user to projects in Group
24	24	Given I have new user "John"
25		- When I visit group people page
	25	+ When I visit group members page
26	26	And I select user "John" from list with role "Reporter"
27	27	Then I should see user "John" in team list
28	28
...	...