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

Fix photo show, js on people search page

Browse source
This commit is contained in:
Raphael 2010-11-21 13:29:50 -05:00
parent 7db1da935a
commit 4ce2de55e2
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/js/_websocket_js.haml
View file

@ -50,7 +50,7 @@
result_ul.children('.error').show(); result_ul.children('.error').show();
result_ul.children('.webfinger_error').text(response['response']).show(); result_ul.children('.webfinger_error').text(response['response']).show();
}else{ }else{
//result_ul.prepend(response['html']).slideDown('slow', function(){}); $('#people_stream').prepend(response['html']).slideDown('slow', function(){});
var first_li = result_ul.find('li:first'); var first_li = result_ul.find('li:first');
first_li.after(response['html']); first_li.after(response['html']);
result_ul.children("[name='into']").val(first_li.attr('aspect_id')); result_ul.children("[name='into']").val(first_li.attr('aspect_id'));

2
app/views/photos/show.html.haml
View file

@ -57,6 +57,6 @@
= link_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete, :class => 'button' = link_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete, :class => 'button'
.span-9.last .span-9.last
%div{id => 'photo_stream', :class => 'stream show'}" %div{id => 'photo_stream', :class => 'stream show'}
%li.message{:data=>{:guid=>@photo.id}} %li.message{:data=>{:guid=>@photo.id}}
= render "comments/comments", :post => @photo = render "comments/comments", :post => @photo

1
spec/controllers/photos_controller_spec.rb
View file

@ -58,6 +58,7 @@ describe PhotosController do
describe '#show' do describe '#show' do
it 'assigns the photo based on the photo id' do it 'assigns the photo based on the photo id' do
get :show, :id => photo.id get :show, :id => photo.id
response.code.should == "200"
assigns[:photo].should == photo assigns[:photo].should == photo
assigns[:ownership].should == true assigns[:ownership].should == true