Added pagination

This commit is contained in:
Eric Davis
2008-06-04 16:21:25 -07:00
parent 85affdb59b
commit 86741878c6
2 changed files with 14 additions and 7 deletions
+13 -6
View File
@@ -10,8 +10,15 @@ class DeliverablesController < ApplicationController
sort_init "#{Deliverable.table_name}.id", "desc"
sort_update
# TODO: pagination
@deliverables = Deliverable.find(:all, { :conditions => { :project_id => @project.id} }.merge(sort_stuff))
@deliverable_count = Deliverable.count(:conditions => { :project_id => @project.id})
@deliverable_pages = Paginator.new self, @deliverable_count, per_page_option, params['page']
@deliverables = Deliverable.find(:all,
{
:conditions => { :project_id => @project.id},
:limit => per_page_option,
:offset => @deliverable_pages.current.offset
}.merge(sort_order)
)
@deliverables = sort_if_needed @deliverables
@@ -112,12 +119,12 @@ class DeliverablesController < ApplicationController
@settings = Setting.plugin_budget_plugin
end
# Sorting limits
def sort_stuff
# Sorting orders
def sort_order
if %w(score spent progress).include?(session[@sort_name][:key])
return { }
return { }
else
return { :limit => per_page_option, :order => sort_clause }
return { :order => sort_clause }
end
end
+1 -1
View File
@@ -65,7 +65,7 @@
<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
<%= render :partial => 'list', :locals => { :deliverables => @deliverables} %>
<p class="pagination"><%# TODO: pagination_links_full @issue_pages, @issue_count %></p>
<p class="pagination"><%= pagination_links_full @deliverable_pages, @deliverable_count %></p>
</div>
<% end %>