nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lets see if that fixes the build

Browse source
This commit is contained in:
MrZYX 2011-04-02 15:53:11 +02:00
parent 1a1a06118f
commit a1c3a6dc1e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/people_controller.rb
View file

@ -91,10 +91,10 @@ class PeopleController < ApplicationController
else else
@commenting_disabled = false @commenting_disabled = false
end end
@posts = current_user.posts_from(@person).where(:type => "StatusMessage").paginate(:per_page => 15, :page => params[:page]) @posts = current_user.posts_from(@person).where(:type => "StatusMessage").includes(:comments).paginate(:per_page => 15, :page => params[:page])
else else
@commenting_disabled = true @commenting_disabled = true
@posts = @person.posts.where(:type => "StatusMessage", :public => true).paginate(:per_page => 15, :page => params[:page], :order => 'created_at DESC') @posts = @person.posts.where(:type => "StatusMessage", :public => true).includes(:comments).paginate(:per_page => 15, :page => params[:page], :order => 'created_at DESC')
end end
@fakes = PostsFake.new(@posts) @fakes = PostsFake.new(@posts)

2
lib/diaspora/user/querying.rb
View file

@ -48,7 +48,7 @@ module Diaspora
end end
def contact_for_person_id(person_id) def contact_for_person_id(person_id)
Contact.unscoped.where(:user_id => self.id, :person_id => person_id).first if person_id Contact.unscoped.where(:user_id => self.id, :person_id => person_id).includes(:person => :profile).first if person_id
end end
def people_in_aspects(requested_aspects, opts={}) def people_in_aspects(requested_aspects, opts={})