jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

还原回复的隐藏

This commit is contained in:
cxt 2016-11-25 19:19:38 +08:00
parent ae7b8b2857
commit c965f72ce3
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -3418,6 +3418,8 @@ def get_reply_by_type type, reply_id
reply = Comment.find reply_id reply = Comment.find reply_id
when 'Issue' when 'Issue'
reply = Journal.find reply_id reply = Journal.find reply_id
when 'Journal'
reply = Journal.find reply_id
when 'Syllabus' when 'Syllabus'
reply = JournalsForMessage.find reply_id reply = JournalsForMessage.find reply_id
end end

4
app/views/projects/_comment_reply_detail.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_user fl"> <div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
</div> </div>
<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();"> <div class="orig_right fl">
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span> <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_content "> <div class="orig_content ">
@ -16,7 +16,7 @@
<%= comment.content_detail.html_safe %> <%= comment.content_detail.html_safe %>
<% end %> <% end %>
</div> </div>
<div class="orig_reply mt-10 none"> <div class="orig_reply mt-10">
<div class="reply"> <div class="reply">
<span class="reply-right"> <span class="reply-right">
<span id="reply_praise_count_<%=comment.id %>"> <span id="reply_praise_count_<%=comment.id %>">

4
app/views/projects/_project_issue_comments_reply_detail.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_user fl"> <div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
</div> </div>
<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();"> <div class="orig_right fl">
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %> <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span> <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_content "> <div class="orig_content ">
@ -16,7 +16,7 @@
<%= comment.content_detail.html_safe %> <%= comment.content_detail.html_safe %>
<% end %> <% end %>
</div> </div>
<div class="orig_reply mt-10 none"> <div class="orig_reply mt-10">
<div class="reply"> <div class="reply">
<span class="reply-right"> <span class="reply-right">
<span id="reply_praise_count_<%=comment.id %>"> <span id="reply_praise_count_<%=comment.id %>">

6
app/views/users/_comment_reply_detail.html.erb
View File

@ -1,7 +1,7 @@
<div class="orig_user fl"> <div class="orig_user fl">
<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
</div> </div>
<div class="orig_right fl" onmouseout="$(this).children('.orig_reply').show();" onmouseover="$(this).children('.orig_reply').show();"> <div class="orig_right fl">
<%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %> <%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
<span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span> <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
<div class="orig_content"> <div class="orig_content">
@ -16,7 +16,7 @@
<%= comment.content_detail.html_safe %> <%= comment.content_detail.html_safe %>
<% end %> <% end %>
</div> </div>
<div class="orig_reply mt-10 none"> <div class="orig_reply mt-10">
<div class="reply"> <div class="reply">
<span class="reply-right"> <span class="reply-right">
<span id="reply_praise_count_<%=comment.id %>"> <span id="reply_praise_count_<%=comment.id %>">
@ -39,7 +39,7 @@
<span style="position: relative" class="fr mr20"> <span style="position: relative" class="fr mr20">
<%= link_to( <%= link_to(
l(:button_reply), 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, :remote => true,
:method => 'get', :method => 'get',
:title => l(:button_reply)) %> :title => l(:button_reply)) %>