Changeset 1211

Show
Ignore:
Timestamp:
07/14/08 15:48:02 (6 months ago)
Author:
kovit
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/portal_controller.rb

    r1210 r1211  
    167167    if @user 
    168168      if @used_by_owner 
    169           @journals = JournalEntry.paginate_by_user_id(@owner.id, :order => "created_at DESC", :page => params[:page], :per_page => $ITEMS_PER_PAGE) 
     169            @journals = JournalEntry.paginate(:all, :conditions => ['(visibility = ? OR visibility = ? OR visibility = ?) AND (user_id in (?)) OR ((user_id=?) AND (visibility = ? OR visibility = ?)) OR ((user_id=?) AND (visibility = ? OR visibility = ?)) ', JournalEntry.public, JournalEntry.protected, JournalEntry.private, get_following, @owner.id, JournalEntry.public, JournalEntry.private, @owner.id, JournalEntry.protected, JournalEntry.private], :order => "created_at DESC", :page => params[:page], :per_page => $ITEMS_PER_PAGE) 
    170170        else 
    171171      @journals = JournalEntry.paginate(:all,