comparison app/controllers/members_controller.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents b2f7f52a164d 622f24f53b42
children
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
30 render :layout => false if request.xhr? 30 render :layout => false if request.xhr?
31 } 31 }
32 format.api { 32 format.api {
33 @offset, @limit = api_offset_and_limit 33 @offset, @limit = api_offset_and_limit
34 @member_count = @project.member_principals.count 34 @member_count = @project.member_principals.count
35 @member_pages = Paginator.new self, @member_count, @limit, params['page'] 35 @member_pages = Paginator.new @member_count, @limit, params['page']
36 @offset ||= @member_pages.current.offset 36 @offset ||= @member_pages.offset
37 @members = @project.member_principals.all( 37 @members = @project.member_principals.all(
38 :order => "#{Member.table_name}.id", 38 :order => "#{Member.table_name}.id",
39 :limit => @limit, 39 :limit => @limit,
40 :offset => @offset 40 :offset => @offset
41 ) 41 )