diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb index 867812f3c..fa69176a8 100644 --- a/app/views/words/_journal_reply_items.html.erb +++ b/app/views/words/_journal_reply_items.html.erb @@ -1,49 +1,51 @@ -<% reply_allow = JournalsForMessage.create_by_user? User.current %> -<% ids_r = 'reply_respond_form_'+ reply.id.to_s %> -
-
- <% if show_name %> - <%= image_tag url_to_avatar(reply.user) %> - <% else %> - <%= image_tag url_to_avatar(nil) %> - <% end %> -
-
- <% id = 'project_respond_form_'+ reply.id.to_s %> - <%= link_to reply.user.name, user_path(reply.user) %> - 回复 - <% parent_jour = JournalsForMessage.find reply.m_reply_id %> - <% if show_name && parent_jour %> +<% parent_jour = JournalsForMessage.where("id = #{reply.m_reply_id}").first %> +<% if parent_jour%> + <% reply_allow = JournalsForMessage.create_by_user? User.current %> + <% ids_r = 'reply_respond_form_'+ reply.id.to_s %> +
+
+ <% if show_name %> + <%= image_tag url_to_avatar(reply.user) %> + <% else %> + <%= image_tag url_to_avatar(nil) %> + <% end %> +
+
+ <% id = 'project_respond_form_'+ reply.id.to_s %> + <%= link_to reply.user.name, user_path(reply.user) %> + 回复 + <% if show_name %> <%= link_to parent_jour.user.name, user_path(parent_jour.user) %> - <% else %> + <% else %> <%= l(:label_anonymous) %> - <% end %> + <% end %>

<%= reply.notes %> -

-

+

+

<%= format_time reply.created_on %> -

-
-
+

+
+
<% if reply_allow %> <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id,:show_name => show_name} %> <% end %> -
-
-
\ No newline at end of file +
+
+
+<% end %> \ No newline at end of file