more

caleywoods · Mar 8, 2011 · b3099ca · b3099ca
1 parent c87b435
commit b3099ca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
@@ -3,6 +3,9 @@ class CategoriesController < ApplicationController
 
   def show
     @categories = Category.published_categories    
+    @category = Category.find(params[:id])
+    @data_sets = @category.data_sets.paginate :page => params[:page], :conditions => {:status => "published"}, :order => 'data_sets.created_at desc', :per_page => 20
+
     show!
   end
 

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -9,7 +9,7 @@ def index
   def show
     @organization = Organization.find(params[:id])
     #@data_sets = @organization.published_data_set
-    @data_sets = @organization.data_sets.paginate :page => params[:page], :conditions => {:status => "published"}, :order => 'name', :per_page => 20
+    @data_sets = @organization.data_sets.paginate :page => params[:page], :conditions => {:status => "published"}, :order => 'data_sets.created_at desc', :per_page => 20
     show!
   end
 

diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
@@ -39,10 +39,12 @@
 		</table>
 	</div>
 
-	<% unless @category.data_sets.blank? %>
+	<% unless @data_sets.blank? %>
 		<div id="data_list">
-			<%= render @category.data_sets %>
+			<%= render @data_sets %>
 		</div>
+		<%= will_paginate(@data_sets) %>
+	  
 	<% else %>
 		<p>We were not able to find any data sets for <%= @category.name%>.</p>
 	<% end %>