Changeset 1203

Show
Ignore:
Timestamp:
07/11/08 13:42:01 (6 months ago)
Author:
kovit
Message:

fix 'journals_controller.rb at def with_friend'

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/controllers/journals_controller.rb

    r1182 r1203  
    8888    if @user 
    8989      @journals = JournalEntry.paginate(:all, 
    90                                        :conditions => ['(visibility = ? OR visibility = ?) AND (user_id in (?)) OR user_id=?', JournalEntry.public, JournalEntry.protected,get_following, @owner.id], 
     90                                       :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], 
    9191                                        :order => "created_at DESC", :page => params[:page], :per_page => $ITEMS_PER_PAGE) 
    9292    else 
    93      @journals = JournalEntry.paginate(:conditions => ["visibility = ? AND (user_id in (?)) OR user_id=?", JournalEntry.public,get_following, @owner.id], 
     93     @journals = JournalEntry.paginate(:conditions => ["visibility = ? AND (user_id in (?)) OR ((user_id=?) AND (visibility = ?))", JournalEntry.public, get_following, @owner.id, JournalEntry.public], 
    9494                                        :order => "created_at DESC", :page => params[:page], :per_page => $ITEMS_PER_PAGE) 
    9595    end