From 4ce2de55e20f1cacba1601faaba543afdb632725 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 21 Nov 2010 13:29:50 -0500 Subject: [PATCH] Fix photo show, js on people search page --- app/views/js/_websocket_js.haml | 2 +- app/views/photos/show.html.haml | 2 +- spec/controllers/photos_controller_spec.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml index 1ee98475f..1aeea7e70 100644 --- a/app/views/js/_websocket_js.haml +++ b/app/views/js/_websocket_js.haml @@ -50,7 +50,7 @@ result_ul.children('.error').show(); result_ul.children('.webfinger_error').text(response['response']).show(); }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'); first_li.after(response['html']); result_ul.children("[name='into']").val(first_li.attr('aspect_id')); diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 23f570645..ea6700a7c 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -57,6 +57,6 @@ = link_to t('.delete_photo'), @photo, :confirm => t('are_you_sure'), :method => :delete, :class => 'button' .span-9.last - %div{id => 'photo_stream', :class => 'stream show'}" + %div{id => 'photo_stream', :class => 'stream show'} %li.message{:data=>{:guid=>@photo.id}} = render "comments/comments", :post => @photo diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 92667b7bc..e82f8cac2 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/spec/controllers/photos_controller_spec.rb @@ -58,6 +58,7 @@ describe PhotosController do describe '#show' do it 'assigns the photo based on the photo id' do get :show, :id => photo.id + response.code.should == "200" assigns[:photo].should == photo assigns[:ownership].should == true