Fix photo show, js on people search page
This commit is contained in:
parent
7db1da935a
commit
4ce2de55e2
3 changed files with 3 additions and 2 deletions
|
|
@ -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'));
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue