Commit a0b6c964 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Proper naming for project members page

parent 32ef2f37
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= nav_link(controller: [:team_members, :teams]) do = nav_link(controller: [:team_members, :teams]) do
= link_to project_team_index_path(@project), class: "team-tab tab" do = link_to project_team_index_path(@project), class: "team-tab tab" do
%i.icon-group %i.icon-group
Project Members Members
= nav_link(controller: :deploy_keys) do = nav_link(controller: :deploy_keys) do
= link_to project_deploy_keys_path(@project) do = link_to project_deploy_keys_path(@project) do
%span %span
......
.ui-box .ui-box
%h5.title %h5.title
= link_to people_group_path(@group) do %strong #{@group.name} Group
Members of #{@group.name} group members (#{@group.users_groups.count})
.pull-right
= link_to people_group_path(@group), class: 'btn btn-small' do
%i.icon-edit
%ul.well-list %ul.well-list
- @group.users_groups.order('group_access DESC').each do |member| - @group.users_groups.order('group_access DESC').each do |member|
= render 'users_groups/users_group', member: member, show_controls: false = render 'users_groups/users_group', member: member, show_controls: false
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
- can_admin_project = (can? current_user, :admin_project, @project) - can_admin_project = (can? current_user, :admin_project, @project)
.ui-box .ui-box
%h5.title %h5.title
Project members (#{members.count}) %strong #{@project.name} Project
members (#{members.count})
%ul.well-list %ul.well-list
- members.each do |team_member| - members.each do |team_member|
= render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project = render 'team_members/team_member', member: team_member, current_user_can_admin_project: can_admin_project
...@@ -15,8 +15,6 @@ ...@@ -15,8 +15,6 @@
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, class: "vlink" %strong= link_to "here", help_permissions_path, class: "vlink"
.clearfix .clearfix
- if @group - if @group
......
...@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps ...@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
# Sub Tabs: Home # Sub Tabs: Home
Given 'I click the "Team" tab' do Given 'I click the "Team" tab' do
click_link('Project Members') click_link('Members')
end end
Given 'I click the "Attachments" tab' do Given 'I click the "Attachments" tab' do
...@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps ...@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
end end
Then 'the active sub tab should be Team' do Then 'the active sub tab should be Team' do
ensure_active_sub_tab('Project Members') ensure_active_sub_tab('Members')
end end
Then 'the active sub tab should be Attachments' do Then 'the active sub tab should be Attachments' 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