# HG changeset patch # User Chris Cannam # Date 1410270327 -3600 # Node ID 4449107c0f9b6c99c9fc7406eed56a2b81b8d711 # Parent 2354ddf5a483b4a23c407f86a9026763b45854ea Restore members index action (never existed in vanilla Redmine, we added it) diff -r 2354ddf5a483 -r 4449107c0f9b app/controllers/members_controller.rb --- 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