make amf_controller use rails objects, and stuff, in the getway method. You need...

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 28eb903a347719b453e94c9bb5aedcbeaa5a6a18..13d3121a5eef32de418f4beada6a907df5570428 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -30,10 +30,15 @@ class DiaryEntryController < ApplicationController
     if params[:display_name]
       @this_user = User.find_by_display_name(params[:display_name])
       @title = @this_user.display_name + "'s diary"
-      @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', @this_user.id], :order => 'created_at DESC')
+      @entry_pages, @entries = paginate(:diary_entries,
+                                        :conditions => ['user_id = ?', @this_user.id],
+                                        :order => 'created_at DESC',
+                                        :per_page => 20)
     else
       @title = "Users' diaries"
-      @entries = DiaryEntry.find(:all, :order => 'created_at DESC', :limit => 20)
+      @entry_pages, @entries = paginate(:diary_entries,
+                                        :order => 'created_at DESC',
+                                        :per_page => 20)
     end
   end