Makes /projects API accept same pagination parameters as other API collection resources.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4572 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7a4c71217a7fe93c78bcea89e88d83864e712d38..2547d61669ced5b7b7024fa29a826600a3cb29ec 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -53,7 +53,9 @@ class ProjectsController < ApplicationController
         @projects = Project.visible.find(:all, :order => 'lft') 
       }
       format.api  {
-        @projects = Project.visible.find(:all, :order => 'lft')
+        @offset, @limit = api_offset_and_limit
+        @project_count = Project.visible.count
+        @projects = Project.visible.all(:offset => @offset, :limit => @limit, :order => 'lft')
       }
       format.atom {
         projects = Project.visible.find(:all, :order => 'created_on DESC',

diff --git a/app/views/projects/index.api.rsb b/app/views/projects/index.api.rsb
index 4ffee934fa6edba986f5a8fac6a479766ce8c615..121300c12c2fb466dd7611645ab64498bb2c530b 100644 (file)
--- a/app/views/projects/index.api.rsb
+++ b/app/views/projects/index.api.rsb
@@ -1,4 +1,4 @@
-api.array :projects do
+api.array :projects, api_meta(:total_count => @project_count, :offset => @offset, :limit => @limit) do
   @projects.each do |project|
     api.project do
       api.id          project.id