Changeset 1210

Timestamp:

07/14/08 14:36:26 (6 months ago)

Author:

kovit

Message:

fix 'app/controllers/portal_controller.rb at def my_journal_monitor'

Files:

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

trunk/app/controllers/portal_controller.rb

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