diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index a1a5ecacb..99be0d588 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3418,6 +3418,8 @@ def get_reply_by_type type, reply_id reply = Comment.find reply_id when 'Issue' reply = Journal.find reply_id + when 'Journal' + reply = Journal.find reply_id when 'Syllabus' reply = JournalsForMessage.find reply_id end diff --git a/app/views/projects/_comment_reply_detail.html.erb b/app/views/projects/_comment_reply_detail.html.erb index d415beeef..f6e2b8fb3 100644 --- a/app/views/projects/_comment_reply_detail.html.erb +++ b/app/views/projects/_comment_reply_detail.html.erb @@ -1,7 +1,7 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
-
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
@@ -16,7 +16,7 @@ <%= comment.content_detail.html_safe %> <% end %>
-
+
diff --git a/app/views/projects/_project_issue_comments_reply_detail.html.erb b/app/views/projects/_project_issue_comments_reply_detail.html.erb index f2645f0bf..58b9f941e 100644 --- a/app/views/projects/_project_issue_comments_reply_detail.html.erb +++ b/app/views/projects/_project_issue_comments_reply_detail.html.erb @@ -1,7 +1,7 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
-
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
@@ -16,7 +16,7 @@ <%= comment.content_detail.html_safe %> <% end %>
-
+
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb index e5522b4a5..23382d972 100644 --- a/app/views/users/_comment_reply_detail.html.erb +++ b/app/views/users/_comment_reply_detail.html.erb @@ -1,7 +1,7 @@
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
-
+
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
@@ -16,7 +16,7 @@ <%= comment.content_detail.html_safe %> <% end %>
-
+
@@ -39,7 +39,7 @@ <%= link_to( l(:button_reply), - {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id}, + {:controller => 'users' ,:action => 'reply_to_comment', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :parent_id => parent_id}, :remote => true, :method => 'get', :title => l(:button_reply)) %>