git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5881 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/1.3.0
@@ -67,13 +67,13 @@ class TimelogController < ApplicationController | |||
} | |||
format.api { | |||
@entry_count = TimeEntry.visible.count(:include => [:project, :issue], :conditions => cond.conditions) | |||
@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page'] | |||
@offset, @limit = api_offset_and_limit | |||
@entries = TimeEntry.visible.find(:all, | |||
:include => [:project, :activity, :user, {:issue => :tracker}], | |||
:conditions => cond.conditions, | |||
:order => sort_clause, | |||
:limit => @entry_pages.items_per_page, | |||
:offset => @entry_pages.current.offset) | |||
:limit => @limit, | |||
:offset => @offset) | |||
} | |||
format.atom { | |||
entries = TimeEntry.visible.find(:all, |
@@ -1,4 +1,4 @@ | |||
api.array :time_entries do | |||
api.array :time_entries, api_meta(:total_count => @entry_count, :offset => @offset, :limit => @limit) do | |||
@entries.each do |time_entry| | |||
api.time_entry do | |||
api.id time_entry.id |
@@ -32,6 +32,16 @@ class ApiTest::TimeEntriesTest < ActionController::IntegrationTest | |||
assert_tag :tag => 'time_entries', | |||
:child => {:tag => 'time_entry', :child => {:tag => 'id', :content => '2'}} | |||
end | |||
context "with limit" do | |||
should "return limited results" do | |||
get '/time_entries.xml?limit=2', {}, :authorization => credentials('jsmith') | |||
assert_response :success | |||
assert_equal 'application/xml', @response.content_type | |||
assert_tag :tag => 'time_entries', | |||
:children => {:count => 2} | |||
end | |||
end | |||
end | |||
context "GET /time_entries/2.xml" do |