diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-04 18:09:00 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-01-04 18:09:00 +0000 |
| commit | 7ec2c2738593c8535c80f85def82b8b680217848 (patch) | |
| tree | c9f6dbe5144430ba2946cf096ab4aff49e5323e3 /app | |
| parent | a9b0564c1374f6e81c5276652444551ac6ad1afa (diff) | |
| download | redmine-7ec2c2738593c8535c80f85def82b8b680217848.tar.gz redmine-7ec2c2738593c8535c80f85def82b8b680217848.zip | |
Merged r16116 (#22034).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16128 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/members_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/_members.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 140d504aa..173b3ee66 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -26,7 +26,7 @@ class MembersController < ApplicationController require_sudo_mode :create, :update, :destroy def index - scope = @project.memberships.active + scope = @project.memberships @offset, @limit = api_offset_and_limit @member_count = scope.count @member_pages = Paginator.new @member_count, @limit, params['page'] diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 31415f80e..185bce4d3 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -1,5 +1,5 @@ <% roles = Role.find_all_givable - members = @project.memberships.active.includes(:member_roles, :roles, :principal).to_a.sort %> + members = @project.memberships.includes(:member_roles, :roles, :principal).to_a.sort %> <p><%= link_to l(:label_member_new), new_project_membership_path(@project), :remote => true, :class => "icon icon-add" %></p> |