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

修正问题

This commit is contained in:
huang 2015-08-20 14:00:31 +08:00
parent f829c6ff23
commit 6b847e27d9
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/journals_for_message.rb
View File

@ -210,8 +210,8 @@ class JournalsForMessage < ActiveRecord::Base
else # 留言回复
# 添加留言回复人
reply_to = User.find(self.reply_id)
if self.user_id != self.parent.user_id # 如果回帖人不是用户自己
receivers << self.parent.jour
if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id # 如果回帖人不是用户自己
receivers << self.parent.user
if self.reply_id != self.parent.user_id
receivers << reply_to
end

30
app/views/users/user_messages.html.erb
View File

@ -51,8 +51,8 @@
<% end %>
<% end %>
<%# 用户留言 %>
<% unless @user_forge_messages.nil? %>
<% unless @user_forge_messages_count > 0 %>
<% unless @user_feedback_messages.nil? %>
<% if @user_feedback_messages_count > 0 %>
<li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'} %></a></li>
<% end %>
<% end %>
@ -224,20 +224,28 @@
<% end %>
<%# 用户留言消息 %>
<% unless @user_feedback_messages.nil? %>
<% @user_forge_messages.each do |urm| %>
<% if urm.memo_type == "Memo" %>
<% @user_feedback_messages.each do |ufm| %>
<% if ufm.journals_for_message_type == "Principal" %>
<ul class="homepageNewsList fl">
<li class="homepageNewsPortrait fl">
<a href="javascript:void(0);"><%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %></a>
<a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>
</li>
<li class="homepageNewsPublisher fl">
<a href="javascript:void(0);" class="<%= urm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= urm.memo.author %></a>
<a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.journals_for_message.user %></a>
</li>
<li class="<%= urm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了贴吧帖子</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to urm.memo.subject, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "#{urm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
</li>
<li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
<% if ufm.journals_for_message.reply_id == 0 %>
<li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">给你留言了</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.jour_id),:class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
</li>
<% else %>
<li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了你的留言</li>
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
<%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.parent.user_id),:class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
</li>
<% end %>
<li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
</ul>
<% end %>
<% end %>