From c165d0b37ef392f01a9c421e87f0dc7635e53fdf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 20 May 2016 14:52:47 +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=A8=A1=E6=9D=BF=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 | 21 ++++++++++++++-------
 config/locales/zh.yml              |  1 +
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 68b747ab9..d0113744c 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -259,19 +259,26 @@ class JournalsForMessage < ActiveRecord::Base
       if self.m_parent_id.nil?
         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)
+          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
+            ws = WechatService.new
+            #content = truncate(strip_tags(self.notes.to_s), length: 200)
+            content = strip_html self.notes.html_safe, 200
+            ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+          end
         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)
+          count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.parent.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count
+          if count == 0
+            ws = WechatService.new
+            #content = truncate(strip_tags(self.notes.to_s), length: 200)
+            content = strip_html self.notes.html_safe, 200
+            ws.comment_template self.parent.user_id, "homework", self.jour_id, "#{l(:label_new_second_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
+          end
         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
-        ws = WechatService.new
-        #content = truncate(strip_tags(self.notes.to_s), length: 200)
-        content = strip_html self.notes.html_safe, 200
-        ws.comment_template self.jour.user_id, "homework", self.jour_id, "#{l(:label_homework_comment_template)}", self.user.try(:realname), format_time(self.created_on), content
-      end
     end
   end
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 18f027dce..a347359bb 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2137,6 +2137,7 @@ zh:
   label_notice_comment_template: 您的课程通知有新回复了
   label_news_comment_template: 您的项目新闻有新回复了
   label_homework_comment_template: 您的作业有新回复了
+  label_new_second_comment_template: 您有新回复了
   label_new_journals_template: 您有新留言了
   label_journals_comment_template: 您的留言有新回复了
   label_blog_comment_template: 您的博客有新回复了