diff 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
line wrap: on
line diff
--- a/app/controllers/members_controller.rb	Fri Jun 14 09:07:32 2013 +0100
+++ b/app/controllers/members_controller.rb	Fri Jun 14 09:28:30 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -32,8 +32,8 @@
       format.api {
         @offset, @limit = api_offset_and_limit
         @member_count = @project.member_principals.count
-        @member_pages = Paginator.new self, @member_count, @limit, params['page']
-        @offset ||= @member_pages.current.offset
+    @member_pages = Paginator.new @member_count, @limit, params['page']
+    @offset ||= @member_pages.offset
         @members =  @project.member_principals.all(
           :order => "#{Member.table_name}.id",
           :limit  =>  @limit,