From 55a98d8d6e89805a268774c0fdca6f47dd9fac9d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 17 May 2016 15:33:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BA=8C=E7=BA=A7=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
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_message_course.html.erb | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 4b5ac227f..68b747ab9 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -260,6 +260,10 @@ class JournalsForMessage < ActiveRecord::Base
         if self.user_id != self.jour.user_id
           self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false)
         end
+      else
+        if self.user_id != self.parent.user_id
+          self.course_messages << CourseMessage.new(:user_id => self.parent.user_id,:course_id => self.jour.course.id, :viewed => false)
+        end
       end
       count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
       if count == 0
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index a80a08e42..bab7bb5ec 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -389,7 +389,13 @@
                     <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></a>
                   </li>
                   <li class="homepageNewsPubType fl"><%= link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">回复了您的作业：</span>
+                    <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                      <% if ma.course_message.m_parent_id.nil? %>
+                          回复了您的作业：
+                      <% else %>
+                          回复了您：
+                      <% end %>
+                    </span>
                   </li>
                   <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                     <%= link_to ma.course_message.notes.html_safe, homework_common_index_url_in_org( ma.course_id),