Changeset 1175

Timestamp:

06/25/08 14:24:22 (7 months ago)

Author:

kovit

Message:

Add 'User Journals Entries'

Files:

• trunk/app/controllers/journals_controller.rb (modified) (1 diff)

trunk/app/controllers/journals_controller.rb

@@ -88 +88 @@
-    if @user
-      @journals = JournalEntry.paginate(:all,
- :conditions => ['(visibility = ? OR visibility = ?) AND user_id in (?)', JournalEntry.public, JournalEntry.protected, get_following
-                                        
-
- @journals = JournalEntry.paginate(:conditions => ["visibility = ? AND user_id in (?)", JournalEntry.public, get_following
+:conditions => ['(visibility = ? OR visibility = ?) AND (user_id in (?)) OR user_id=?', JournalEntry.public, JournalEntry.protected,get_following, @owner.id
+                                       
+
+@journals = JournalEntry.paginate(:conditions => ["visibility = ? AND (user_id in (?)) OR user_id=?", JournalEntry.public,get_following, @owner.id
-                                        :order => "created_at DESC", :page => params[:page], :per_page => $ITEMS_PER_PAGE)
-    end