From 6b847e27d98db77189acb5b784771ff3f644cfee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 20 Aug 2015 14:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb     |  4 ++--
 app/views/users/user_messages.html.erb | 30 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 2c397ffcf..bb59f612d 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -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
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 80deeb8f6..adfc6290b 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -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 %>