Mercurial > hg > soundsoftware-site
changeset 1522:4449107c0f9b redmine-2.5-integration
Restore members index action (never existed in vanilla Redmine, we added it)
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Tue, 09 Sep 2014 14:45:27 +0100 |
parents | 2354ddf5a483 |
children | 4aa2e3311d03 |
files | app/controllers/members_controller.rb |
diffstat | 1 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/members_controller.rb Tue Sep 09 14:27:58 2014 +0100 +++ b/app/controllers/members_controller.rb Tue Sep 09 14:45:27 2014 +0100 @@ -25,18 +25,21 @@ accept_api_auth :index, :show, :create, :update, :destroy def index - @offset, @limit = api_offset_and_limit - @member_count = @project.member_principals.count - @member_pages = Paginator.new @member_count, @limit, params['page'] - @offset ||= @member_pages.offset - @members = @project.member_principals. - order("#{Member.table_name}.id"). - limit(@limit). - offset(@offset). - all respond_to do |format| - format.html { head 406 } - format.api + format.html { + render :layout => false if request.xhr? + } + format.api { + @offset, @limit = api_offset_and_limit + @member_count = @project.member_principals.count + @member_pages = Paginator.new @member_count, @limit, params['page'] + @offset ||= @member_pages.offset + @members = @project.member_principals. + order("#{Member.table_name}.id"). + limit(@limit). + offset(@offset). + all + } end end