Feature #44581 » 0001-Make-project-members-page-available-to-all-users-wit.patch
| app/controllers/members_controller.rb | ||
|---|---|---|
|
class MembersController < ApplicationController
|
||
|
self.model_object = Member
|
||
|
menu_item :overview
|
||
|
before_action :find_model_object, :except => [:index, :new, :create, :autocomplete]
|
||
|
before_action :find_project_from_association, :except => [:index, :new, :create, :autocomplete]
|
||
|
before_action :find_project_by_project_id, :only => [:index, :new, :create, :autocomplete]
|
||
| ... | ... | |
|
include MembersHelper
|
||
|
def index
|
||
|
scope = @project.memberships
|
||
|
@members = scope.includes(:principal, :roles).order(:id)
|
||
|
respond_to do |format|
|
||
|
format.html {head :not_acceptable}
|
||
|
format.html
|
||
|
format.api do
|
||
|
scope = @project.memberships
|
||
|
@members = scope.includes(:principal, :roles).order(:id)
|
||
|
@offset, @limit = api_offset_and_limit
|
||
|
@member_count = scope.count
|
||
|
@member_pages = Paginator.new @member_count, @limit, params['page']
|
||
| ... | ... | |
|
@members = @members.limit(@limit).offset(@offset).to_a
|
||
|
end
|
||
|
format.csv do
|
||
|
send_data(members_to_csv(@members), type: 'text/csv; header=present', filename: "#{@project.identifier}-members.csv")
|
||
|
if User.current.allowed_to?(:manage_members, @project)
|
||
|
scope = @project.memberships
|
||
|
@members = scope.includes(:principal, :roles).order(:id)
|
||
|
send_data(members_to_csv(@members), type: 'text/csv; header=present', filename: "#{@project.identifier}-members.csv")
|
||
|
else
|
||
|
head :forbidden
|
||
|
end
|
||
|
end
|
||
|
end
|
||
|
end
|
||
| app/helpers/members_helper.rb | ||
|---|---|---|
|
# Returns the scope of the members of project matching the filters
|
||
|
# set in the request params
|
||
|
def members_scope(project)
|
||
|
project.memberships.
|
||
|
like(params[:member_name]).
|
||
|
with_role(params[:member_role_id]).
|
||
|
status(params[:member_status])
|
||
|
scope =
|
||
|
project.memberships.
|
||
|
like(params[:member_name]).
|
||
|
with_role(params[:member_role_id])
|
||
|
if User.current.allowed_to?(:manage_members, project)
|
||
|
scope.status(params[:member_status])
|
||
|
else
|
||
|
scope.active
|
||
|
end
|
||
|
end
|
||
|
# limit/offset on Member.sorted would paginate role join rows, not members
|
||
| app/helpers/projects_helper.rb | ||
|---|---|---|
|
{:name => 'info', :action => :edit_project,
|
||
|
:partial => 'projects/edit', :label => :label_project},
|
||
|
{:name => 'members', :action => :manage_members,
|
||
|
:partial => 'projects/settings/members', :label => :label_member_plural,
|
||
|
:partial => 'members/members', :label => :label_member_plural,
|
||
|
:url => {:tab => 'members'}.merge(members_list_params)},
|
||
|
{:name => 'issues', :action => :edit_project, :module => :issue_tracking,
|
||
|
:partial => 'projects/settings/issues', :label => :label_issue_tracking},
|
||
| app/helpers/routes_helper.rb | ||
|---|---|---|
|
def board_path(board, *)
|
||
|
project_board_path(board.project, board, *)
|
||
|
end
|
||
|
def _project_members_path(project, parameters = {})
|
||
|
params = parameters.is_a?(Hash) ? parameters.except('tab', :tab) : parameters
|
||
|
if controller_name == 'members' && action_name == 'index'
|
||
|
project_members_path(project, params)
|
||
|
else
|
||
|
settings_project_path(project, 'members', params)
|
||
|
end
|
||
|
end
|
||
|
end
|
||
| app/views/members/_members.html.erb | ||
|---|---|---|
|
<% members, member_pages, member_count = paginate_members(members_scope(@project)) %>
|
||
|
<% if User.current.admin? %>
|
||
|
<div class="contextual"><%= link_to sprite_icon('settings', l(:label_administration)), users_path, :class => "icon icon-settings" %></div>
|
||
|
<% end %>
|
||
|
<% if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
<p><%= link_to sprite_icon('add', l(:label_member_new)), new_project_membership_path(@project, members_list_params), :remote => true, :class => "icon icon-add" %></p>
|
||
|
<% end %>
|
||
|
<%= form_tag(_project_members_path(@project), :method => :get, :id => 'members-filter-form') do %>
|
||
|
<fieldset><legend><%= l(:label_filter_plural) %></legend>
|
||
|
<label for='member_name'><%= l(:label_user) %> / <%= l(:label_group) %>:</label>
|
||
|
<%= text_field_tag 'member_name', params[:member_name], :size => 20 %>
|
||
|
<label for='member_role_id'><%= l(:label_role) %>:</label>
|
||
|
<%= select_tag 'member_role_id',
|
||
|
options_for_select([[l(:label_all), '']] + Role.givable.pluck(:name, :id), params[:member_role_id]),
|
||
|
:onchange => "this.form.submit(); return false;" %>
|
||
|
<% if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
<label for='member_status'><%= l(:field_status) %>:</label>
|
||
|
<%= select_tag 'member_status',
|
||
|
options_for_select(member_status_options, params[:member_status]),
|
||
|
:onchange => "this.form.submit(); return false;" %>
|
||
|
<% end %>
|
||
|
<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
|
||
|
<%= link_to sprite_icon('reload', l(:button_clear)), _project_members_path(@project), :class => 'icon icon-reload' %>
|
||
|
</fieldset>
|
||
|
<% end %>
|
||
|
|
||
|
<% if member_count > 0 %>
|
||
|
<div class="autoscroll">
|
||
|
<table class="list members">
|
||
|
<thead>
|
||
|
<tr>
|
||
|
<th><%= l(:label_user) %> / <%= l(:label_group) %></th>
|
||
|
<th><%= l(:label_role_plural) %></th>
|
||
|
<% if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
<th></th>
|
||
|
<% end %>
|
||
|
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
|
||
|
</tr>
|
||
|
</thead>
|
||
|
<tbody>
|
||
|
<% members.each do |member| %>
|
||
|
<% next if member.new_record? %>
|
||
|
<tr id="member-<%= member.id %>" class="member">
|
||
|
<td class="name">
|
||
|
<span class="icon">
|
||
|
<% if member.principal %>
|
||
|
<%= link_to_principal member.principal %>
|
||
|
<% end %>
|
||
|
</span>
|
||
|
</td>
|
||
|
<td class="roles">
|
||
|
<span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
|
||
|
<div id="member-<%= member.id %>-form"></div>
|
||
|
</td>
|
||
|
<% if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
<td class="buttons">
|
||
|
<%= link_to sprite_icon('edit', l(:button_edit)),
|
||
|
edit_membership_path(member, members_list_params),
|
||
|
:remote => true,
|
||
|
:class => 'icon icon-edit' %>
|
||
|
<%= remove_link membership_path(member, members_list_params),
|
||
|
:remote => true,
|
||
|
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
|
||
|
</td>
|
||
|
<% end %>
|
||
|
<%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
</tr>
|
||
|
<% end %>
|
||
|
</tbody>
|
||
|
</table>
|
||
|
</div>
|
||
|
<span class="pagination">
|
||
|
<%= pagination_links_full(member_pages, member_count) do |text, parameters, options|
|
||
|
link_to text, _project_members_path(@project, request.query_parameters.merge(parameters)), options
|
||
|
end %>
|
||
|
</span>
|
||
|
<% if User.current.allowed_to?(:manage_members, @project) %>
|
||
|
<% other_formats_links do |f| %>
|
||
|
<%= f.link_to_with_query_parameters "CSV", {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
||
|
<% end %>
|
||
|
<div id="csv-export-options" style="display: none;">
|
||
|
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
|
||
|
<%= form_tag(project_memberships_path(project_id: @project.id, format: 'csv'), :method => :get, :id => 'csv-export-form') do %>
|
||
|
<%= export_csv_encoding_select_tag %>
|
||
|
<p class="buttons">
|
||
|
<%= submit_tag l(:button_export), :name => nil, :onclick => 'hideModal(this);', :data => {:disable_with => false} %>
|
||
|
<%= link_to_function l(:button_cancel), 'hideModal(this);' %>
|
||
|
</p>
|
||
|
<% end %>
|
||
|
</div>
|
||
|
<% end %>
|
||
|
<% else %>
|
||
|
<p class="nodata"><%= l(:label_no_data) %></p>
|
||
|
<% end %>
|
||
| app/views/members/index.html.erb | ||
|---|---|---|
|
<h2><%= l(:label_member_plural) %></h2>
|
||
|
<%= render :partial => 'members' %>
|
||
|
<% html_title(l(:label_member_plural)) -%>
|
||
| app/views/projects/_members_box.html.erb | ||
|---|---|---|
|
<% @principals_by_role.keys.sort.each do |role| %>
|
||
|
<p><span class="label"><%= role %>:</span> <%= @principals_by_role[role].sort.collect{|p| link_to_principal(p, :class => p.is_a?(Group) ? 'icon icon-group' : nil)}.join(", ").html_safe %></p>
|
||
|
<% end %>
|
||
|
<% if User.current.allowed_to?(:view_members, @project) %>
|
||
|
<p><%= link_to l(:label_member_view_all), project_members_path(@project) %></p>
|
||
|
<% end %>
|
||
|
</div>
|
||
|
<% end %>
|
||
| app/views/projects/settings/_members.html.erb | ||
|---|---|---|
|
<% members, member_pages, member_count = paginate_members(members_scope(@project)) %>
|
||
|
<% if User.current.admin? %>
|
||
|
<div class="contextual"><%= link_to sprite_icon('settings', l(:label_administration)), users_path, :class => "icon icon-settings" %></div>
|
||
|
<% end %>
|
||
|
<p><%= link_to sprite_icon('add', l(:label_member_new)), new_project_membership_path(@project, members_list_params), :remote => true, :class => "icon icon-add" %></p>
|
||
|
<%= form_tag(settings_project_path(@project, :tab => 'members'), :method => :get, :id => 'members-filter-form') do %>
|
||
|
<fieldset><legend><%= l(:label_filter_plural) %></legend>
|
||
|
<label for='member_name'><%= l(:label_user) %> / <%= l(:label_group) %>:</label>
|
||
|
<%= text_field_tag 'member_name', params[:member_name], :size => 20 %>
|
||
|
<label for='member_role_id'><%= l(:label_role) %>:</label>
|
||
|
<%= select_tag 'member_role_id',
|
||
|
options_for_select([[l(:label_all), '']] + Role.givable.pluck(:name, :id), params[:member_role_id]),
|
||
|
:onchange => "this.form.submit(); return false;" %>
|
||
|
<label for='member_status'><%= l(:field_status) %>:</label>
|
||
|
<%= select_tag 'member_status',
|
||
|
options_for_select(member_status_options, params[:member_status]),
|
||
|
:onchange => "this.form.submit(); return false;" %>
|
||
|
<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
|
||
|
<%= link_to sprite_icon('reload', l(:button_clear)), settings_project_path(@project, :tab => 'members'), :class => 'icon icon-reload' %>
|
||
|
</fieldset>
|
||
|
<% end %>
|
||
|
|
||
|
<% if member_count > 0 %>
|
||
|
<div class="autoscroll">
|
||
|
<table class="list members">
|
||
|
<thead>
|
||
|
<tr>
|
||
|
<th><%= l(:label_user) %> / <%= l(:label_group) %></th>
|
||
|
<th><%= l(:label_role_plural) %></th>
|
||
|
<th></th>
|
||
|
<%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
|
||
|
</tr>
|
||
|
</thead>
|
||
|
<tbody>
|
||
|
<% members.each do |member| %>
|
||
|
<% next if member.new_record? %>
|
||
|
<tr id="member-<%= member.id %>" class="member">
|
||
|
<td class="name">
|
||
|
<span class="icon">
|
||
|
<% if member.principal %>
|
||
|
<%= link_to_principal member.principal %>
|
||
|
<% end %>
|
||
|
</span>
|
||
|
</td>
|
||
|
<td class="roles">
|
||
|
<span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
|
||
|
<div id="member-<%= member.id %>-form"></div>
|
||
|
</td>
|
||
|
<td class="buttons">
|
||
|
<%= link_to sprite_icon('edit', l(:button_edit)),
|
||
|
edit_membership_path(member, members_list_params),
|
||
|
:remote => true,
|
||
|
:class => 'icon icon-edit' %>
|
||
|
<%= remove_link membership_path(member, members_list_params),
|
||
|
:remote => true,
|
||
|
:data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
|
||
|
</td>
|
||
|
<%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
|
||
|
</tr>
|
||
|
<% end %>
|
||
|
</tbody>
|
||
|
</table>
|
||
|
</div>
|
||
|
<span class="pagination">
|
||
|
<%= pagination_links_full(member_pages, member_count) do |text, parameters, options|
|
||
|
link_to text, settings_project_path(@project, 'members', request.query_parameters.except('tab', :tab).merge(parameters)), options
|
||
|
end %>
|
||
|
</span>
|
||
|
<% other_formats_links do |f| %>
|
||
|
<%= f.link_to_with_query_parameters "CSV", {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
|
||
|
<% end %>
|
||
|
<div id="csv-export-options" style="display: none;">
|
||
|
<h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
|
||
|
<%= form_tag(project_memberships_path(project_id: @project.id, format: 'csv'), :method => :get, :id => 'csv-export-form') do %>
|
||
|
<%= export_csv_encoding_select_tag %>
|
||
|
<p class="buttons">
|
||
|
<%= submit_tag l(:button_export), :name => nil, :onclick => 'hideModal(this);', :data => {:disable_with => false} %>
|
||
|
<%= link_to_function l(:button_cancel), 'hideModal(this);' %>
|
||
|
</p>
|
||
|
<% end %>
|
||
|
</div>
|
||
|
<% else %>
|
||
|
<p class="nodata"><%= l(:label_no_data) %></p>
|
||
|
<% end %>
|
||
|
<%= render :partial => 'members/members' %>
|
||
| config/locales/en.yml | ||
|---|---|---|
|
label_member: Member
|
||
|
label_member_new: New member
|
||
|
label_member_plural: Members
|
||
|
label_member_view_all: View all members
|
||
|
label_tracker: Tracker
|
||
|
label_tracker_plural: Trackers
|
||
|
label_tracker_all: All trackers
|
||
| config/routes.rb | ||
|---|---|---|
|
end
|
||
|
end
|
||
|
get 'members', :to => 'members#index', :as => 'members'
|
||
|
resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
|
||
|
get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
|
||
| test/functional/members_controller_test.rb | ||
|---|---|---|
|
assert_response :success
|
||
|
assert_include 'User Misc', response.body
|
||
|
end
|
||
|
def test_index_html_should_render_members_page
|
||
|
get(:index, :params => {:project_id => 1})
|
||
|
assert_response :success
|
||
|
assert_select 'h2', :text => 'Members'
|
||
|
assert_select 'div#main-menu a.overview.selected'
|
||
|
assert_select 'title', :text => 'Members - eCookbook - Redmine'
|
||
|
assert_select 'form#members-filter-form[action=?]', '/projects/ecookbook/members' do
|
||
|
assert_select 'input[name=member_name]'
|
||
|
assert_select 'select[name=member_role_id]'
|
||
|
assert_select 'input[type=submit]'
|
||
|
assert_select 'a[href=?]', '/projects/ecookbook/members'
|
||
|
end
|
||
|
assert_select 'table.list.members'
|
||
|
end
|
||
|
def test_index_html_filter_by_status
|
||
|
@request.session[:user_id] = 2
|
||
|
get(:index, :params => {:project_id => 1, :member_status => 3})
|
||
|
assert_response :success
|
||
|
assert_select 'table.list.members tbody tr.member', :count => 1
|
||
|
assert_select 'tr#member-4'
|
||
|
assert_select 'tr#member-1', :count => 0
|
||
|
assert_select 'tr#member-2', :count => 0
|
||
|
end
|
||
|
def test_index_html_for_user_with_manage_members_permission_should_display_actions
|
||
|
@request.session[:user_id] = 2 # user 2 has manage_members
|
||
|
get(:index, :params => {:project_id => 1})
|
||
|
assert_response :success
|
||
|
assert_select 'p a.icon-add'
|
||
|
assert_select 'td.buttons a.icon-edit'
|
||
|
assert_select 'select[name=member_status]'
|
||
|
end
|
||
|
def test_index_html_for_user_without_manage_members_permission_should_not_display_actions
|
||
|
role = Role.create!(:name => 'Viewer', :permissions => [:view_project, :view_members])
|
||
|
user = User.generate!
|
||
|
User.add_to_project(user, Project.find(1), role)
|
||
|
@request.session[:user_id] = user.id
|
||
|
get(:index, :params => {:project_id => 1})
|
||
|
assert_response :success
|
||
|
assert_select 'p a.icon-add', :count => 0
|
||
|
assert_select 'td.buttons', :count => 0
|
||
|
assert_select 'select[name=member_status]', :count => 0
|
||
|
assert_select 'tr#member-4', :count => 0
|
||
|
end
|
||
|
def test_index_html_for_user_without_manage_members_permission_should_only_show_active_members
|
||
|
role = Role.create!(:name => 'Viewer', :permissions => [:view_project, :view_members])
|
||
|
user = User.generate!
|
||
|
User.add_to_project(user, Project.find(1), role)
|
||
|
@request.session[:user_id] = user.id
|
||
|
get(:index, :params => {:project_id => 1, :member_status => 3})
|
||
|
assert_response :success
|
||
|
assert_select 'select[name=member_status]', :count => 0
|
||
|
assert_select 'tr#member-4', :count => 0
|
||
|
assert_select 'tr#member-1'
|
||
|
assert_select 'tr#member-2'
|
||
|
end
|
||
|
def test_index_html_filter_by_name
|
||
|
get(:index, :params => {:project_id => 1, :member_name => 'John'})
|
||
|
assert_response :success
|
||
|
assert_select 'table.list.members tbody tr.member', :count => 1
|
||
|
assert_select 'tr#member-1'
|
||
|
end
|
||
|
def test_index_html_filter_by_role
|
||
|
get(:index, :params => {:project_id => 1, :member_role_id => 2})
|
||
|
assert_response :success
|
||
|
assert_select 'table.list.members tbody tr.member'
|
||
|
assert_select 'tr#member-2'
|
||
|
assert_select 'tr#member-1', :count => 0
|
||
|
end
|
||
|
def test_index_html_with_pagination
|
||
|
project = Project.find(1)
|
||
|
26.times { User.add_to_project(User.generate!, project, Role.find(2)) }
|
||
|
with_settings :per_page_options => '25,50,100' do
|
||
|
get(:index, :params => {:project_id => 1, :members_page => 2})
|
||
|
assert_response :success
|
||
|
assert_select 'span.pagination'
|
||
|
assert_select 'span.pagination a[href*=?]', '/projects/ecookbook/members?members_page='
|
||
|
assert_select 'span.pagination a[href*=?]', 'settings/members', :count => 0
|
||
|
end
|
||
|
end
|
||
|
def test_index_html_unauthorized_user_should_be_denied
|
||
|
@request.session[:user_id] = nil
|
||
|
get(:index, :params => {:project_id => 2})
|
||
|
assert_response :redirect
|
||
|
end
|
||
|
end
|
||
| test/functional/projects_controller_test.rb | ||
|---|---|---|
|
get(:show, :params => {:id => 1})
|
||
|
assert_response :success
|
||
|
assert_select '#header h1', :text => "eCookbook"
|
||
|
assert_select 'div.members.box a[href=?]', '/projects/ecookbook/members', :text => 'View all members'
|
||
|
end
|
||
|
def test_show_by_identifier
|
||
| ... | ... | |
|
}
|
||
|
)
|
||
|
assert_response :success
|
||
|
assert_select 'div#main-menu a.settings.selected'
|
||
|
assert_select "tr#member-#{user_member.id} td.name a[href=?]", "/users/#{user.id}", :text => user.name
|
||
|
assert_select "tr#member-#{group_member.id} td.name a[href=?]", '/groups/10', :text => 'A Team'
|
||
|
end
|
||
| test/helpers/members_helper_test.rb | ||
|---|---|---|
|
end
|
||
|
def test_members_scope_default_should_return_all_members
|
||
|
User.current = User.find(2)
|
||
|
project = Project.find(1)
|
||
|
stubs(:params).returns({})
|
||
| ... | ... | |
|
end
|
||
|
def test_members_scope_with_status_active_should_filter_by_active_status
|
||
|
User.current = User.find(2)
|
||
|
project = Project.find(1)
|
||
|
stubs(:params).returns({:member_status => '1'})
|
||
| ... | ... | |
|
end
|
||
|
def test_members_scope_with_status_locked_should_return_locked_members
|
||
|
User.current = User.find(2)
|
||
|
project = Project.find(1)
|
||
|
stubs(:params).returns({:member_status => '3'})
|
||
|
assert_equal [4], members_scope(project).ids.sort
|
||
|
end
|
||
|
def test_members_scope_for_user_without_manage_members_permission_should_return_active_members_only
|
||
|
User.current = User.find(4)
|
||
|
project = Project.find(1)
|
||
|
stubs(:params).returns({:member_status => '3'})
|
||
|
assert_equal [1, 2], members_scope(project).ids.sort
|
||
|
end
|
||
|
end
|
||
| test/helpers/routes_helper_test.rb | ||
|---|---|---|
|
assert_equal 'http://test.host/projects/ecookbook/issues?set_filter=1', _project_issues_url(Project.find(1), set_filter: 1)
|
||
|
assert_equal 'http://test.host/issues?set_filter=1', _project_issues_url(nil, set_filter: 1)
|
||
|
end
|
||
|
def test_project_members_path_in_settings_context
|
||
|
project = Project.find('ecookbook')
|
||
|
stubs(:controller_name).returns('projects')
|
||
|
stubs(:action_name).returns('settings')
|
||
|
assert_equal '/projects/ecookbook/settings/members', _project_members_path(project)
|
||
|
assert_equal '/projects/ecookbook/settings/members?members_page=2', _project_members_path(project, :members_page => 2)
|
||
|
assert_equal '/projects/ecookbook/settings/members?members_page=2', _project_members_path(project, :tab => 'members', :members_page => 2)
|
||
|
end
|
||
|
def test_project_members_path_in_project_members_context
|
||
|
project = Project.find('ecookbook')
|
||
|
stubs(:controller_name).returns('members')
|
||
|
stubs(:action_name).returns('index')
|
||
|
assert_equal '/projects/ecookbook/members', _project_members_path(project)
|
||
|
assert_equal '/projects/ecookbook/members?members_page=2', _project_members_path(project, :members_page => 2)
|
||
|
assert_equal '/projects/ecookbook/members?members_page=2', _project_members_path(project, :tab => 'members', :members_page => 2)
|
||
|
end
|
||
|
end
|
||