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

MS RS fixed photo show bug

Browse source
This commit is contained in:
maxwell 2010-11-08 14:05:01 -08:00
parent 38a1b948ed
commit 4d2820e31c
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/photos_controller.rb
View file

@ -12,9 +12,10 @@ class PhotosController < ApplicationController
if params[:person_id] if params[:person_id]
@person = current_user.contact_for_person_id(params[:person_id]) @person = current_user.contact_for_person_id(params[:person_id])
@person = @person.person if @person @person = @person.person if @person
else
@person = current_user.person
end end
@person ||= current_user.person
@photos = current_user.visible_posts(:_type => "Photo", :person_id => @person.id) @photos = current_user.visible_posts(:_type => "Photo", :person_id => @person.id)
@aspect = :photos @aspect = :photos

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

@ -42,7 +42,7 @@ module Diaspora
end end
def contact_for_person_id(person_id) def contact_for_person_id(person_id)
friends.first(:person_id => person_id) friends(:person_id => person_id).first
end end
def friends_not_in_aspect( aspect ) def friends_not_in_aspect( aspect )

2
spec/controllers/photos_controller_spec.rb
View file

@ -42,7 +42,7 @@ describe PhotosController do
end end
it 'sets the person to a friend if person_id is set' do it 'sets the person to a friend if person_id is set' do
get :index, :person_id => user2.person.id get :index, :person_id => user2.person.id.to_s
assigns[:person].should == user2.person assigns[:person].should == user2.person
assigns[:photos].should == [] assigns[:photos].should == []