Skip to content
Extraits de code Groupes Projets
Valider 06ff5923 rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

fix photos#show and status_messages#show from previous commit

parent a932547d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -82,9 +82,9 @@ ...@@ -82,9 +82,9 @@
- if @photo.status_message_id - if @photo.status_message_id
%div{:id => 'status_message_stream', :class => 'stream show'} %div{:id => 'status_message_stream', :class => 'stream show'}
%li.message{:data=>{:guid=>@photo.status_message_id}} %li.message{:data=>{:guid=>@photo.status_message_id}}
= render "comments/comments", :post => @photo.status_message = render "comments/comments", :post_id => @photo.status_message.id, :comments => @photo.status_message.comments
- else - else
%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_id => @photo.id, :comments => @photo.comments
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
%h4{:style=>"margin-bottom:5px;"}= t('_comments') %h4{:style=>"margin-bottom:5px;"}= t('_comments')
%div{:class => 'stream show', :id => 'status_message_stream'} %div{:class => 'stream show', :id => 'status_message_stream'}
%li.message{:data=>{:guid=>@status_message.id}} %li.message{:data=>{:guid=>@status_message.id}}
= render "comments/comments", :post => @status_message = render "comments/comments", :post_id => @status_message.id, :comments => @status_message.comments
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter