From 716ffcfdc9cbf33be61cebf162349c187998ae54 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Aug 2015 14:35:26 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 34b719b80..2c4bb8b8a 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -229,7 +229,7 @@
                           </li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了" : "回复了你的留言" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}".html_safe %></a>
+                            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %></a>
                           </li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
                         </ul>

From 03ac1ca37cac01c5e131b4e8ca5618db8e706120 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 15:20:24 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BA=BA=E7=89=A9?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 28 +++++++++++++-------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 1a1b06667..d312a5951 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -37,7 +37,7 @@
                 <% if ma.class == CourseMessage %>
                     <% if ma.course_message_type == "News" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
                           <li class="homepageNewsContent fl">
@@ -49,7 +49,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Comment" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了通知</li>
                           <li class="homepageNewsContent fl">
@@ -61,7 +61,7 @@
                     <% end %>
                     <% if ma.course_message_type == "HomeworkCommon" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布作业</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -71,7 +71,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Poll" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -83,7 +83,7 @@
                     <% end %>
                     <% if ma.course_message_type == "Message" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <% if ma.course_message.parent_id.nil? %>
                               <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
@@ -104,7 +104,7 @@
                     <% end %>
                     <% if ma.course_message_type == "StudentWorksScore" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评阅了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -114,7 +114,7 @@
                     <% end %>
                     <% if ma.course_message_type == "JournalsForMessage" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了作品</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
@@ -128,7 +128,7 @@
                     <% if ma.forge_message_type == "Issue" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
@@ -143,7 +143,7 @@
                     <% if ma.forge_message_type == "Journal" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue" %>
@@ -160,7 +160,7 @@
                     <% end %>
                     <% if ma.forge_message_type == "Message" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
 
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
@@ -175,7 +175,7 @@
                     <% if ma.forge_message_type == "News" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
@@ -189,7 +189,7 @@
                     <% end %>
                     <% if ma.forge_message_type == "Comment" %>
                         <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30") %></a></li>
+                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了新闻</li>
                           <li class="homepageNewsContent fl">
@@ -204,7 +204,7 @@
                     <% if ma.memo_type == "Memo" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
@@ -222,7 +222,7 @@
                     <% if ma.journals_for_message_type == "JournalsForMessage" %>
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30") %></a>
+                            <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"), user_path(ma.journals_for_message.user) %></a>
                           </li>
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue" %>

From 9096fca2985694cf0d6f03ac377d30e0961423dd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Aug 2015 15:37:08 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/journals_for_message.rb | 18 ++++++++++++------
 public/stylesheets/new_public.css  |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 2c56dc035..1f5f2e1a6 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -209,14 +209,20 @@ class JournalsForMessage < ActiveRecord::Base
       end
     else # 留言回复
       reply_to = User.find(self.reply_id)
-      if self.user_id != self.parent.user_id
-        receivers << reply_to
-        if self.reply_id != self.parent.user_id
-          receivers << self.parent.user
-        end
-      else
+      if self.user_id != self.reply_id # 添加我回复的那个人
         receivers << reply_to
       end
+      if self.user_id != self.parent.jour_id # 给东家发信息
+        receivers << self.parent.jour
+      end
+      # if self.user_id != self.parent.user_id
+      #   receivers << reply_to
+      #   if self.reply_id != self.parent.user_id
+      #     receivers << self.parent.user
+      #   end
+      # else
+      #   receivers << reply_to
+      # end
 
       # 添加留言回复人
       #reply_to = User.find(self.reply_id)
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index 3b748cda9..265890110 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -578,7 +578,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher {width:80px; max-width:80px; margin-right:10px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .homepageNewsType {width:95px; font-size:12px; color:#888888; display:block;}
-.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsContent {width:395px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;height:49px; max-height:49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}

From f56d9ed26500832fcc3c49dd863b89ea519e23c0 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 16:42:29 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84forge=5Fmessages=E8=A1=A8=E7=9A=84vi?=
 =?UTF-8?q?ewed=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 01f858442..1af832b79 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -11,6 +11,13 @@ class StudentWorkController < ApplicationController
   protect_from_forgery :except => :set_program_score
 
   def index
+    #设置作业对应的forge_messages表的viewed字段
+    query_student_work = @homework.course_messages
+    query_student_work.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
     @order,@b_sort,@name,@group = params[:order] || "score",params[:sort] || "desc",params[:name] || "",params[:group]
     @is_teacher = User.current.allowed_to?(:as_teacher,@course)
     course_group = CourseGroup.find_by_id(@group) if @group

From 0056fa9db3eda4841d1bd49654eba077ba375216 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 17:06:38 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E9=97=AE=E5=8D=B7=E7=9A=84link=5Fto=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84course=5Fmessages=E7=9A=84viewed?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb     | 6 ++++++
 app/views/users/user_messages.html.erb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index edf8c2259..1bbcf9bb4 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -28,6 +28,12 @@ class PollController < ApplicationController
       render_403
       return
     end
+    query_course_poll = @poll.course_messages
+    query_course_poll.each do |query|
+      if User.current.id == query.user_id
+        query.update_attributes(:viewed => true)
+      end
+    end
     #已提交问卷的用户不能再访问该界面
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
       redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index ab44d4983..72625232b 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -75,7 +75,7 @@
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ma.course_id),
+                            <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
                                         :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
                                         :title => "#{ma.course_message.polls_name}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>

From 24f26749c0261ddcaaf12764918d74d3e4a7874b Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 17:41:59 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9memo=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84memo=5Fmessages=E7=9A=84viewed=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/memos_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 68f6f6473..11d1d6e18 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -115,6 +115,8 @@ class MemosController < ApplicationController
   
   REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE)
   def show
+    #更新贴吧帖子留言对应的memo_messages的viewed字段
+    query_memo_messages = @memo.memo_messages
     pre_count = REPLIES_PER_PAGE
 
     @memo = @memo.root # 取出楼主，防止输入帖子id让回复作为主贴显示

From 10e39a69671b8ca041bfedb819de7349bed567a8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 25 Aug 2015 17:42:39 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=8F=91=E5=B8=96=E7=9A=84=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 72625232b..fd979faf9 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -211,7 +211,7 @@
                           </li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ma.memo.content.html_safe, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
+                            <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
                           </li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.memo.created_at).html_safe %> </li>
                         </ul>

From 627ca059ca0849d6a931aae1289c7cd702dc2d65 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Aug 2015 19:30:22 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3issue=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20=E5=92=8C=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/issue.rb                    | 12 ++++++------
 app/models/journal.rb                  |  7 ++++---
 app/views/users/user_messages.html.erb |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a63f05e0a..fa8cee988 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -83,7 +83,7 @@ class Issue < ActiveRecord::Base
   
   # fq
   after_create :act_as_activity,:be_user_score_new_issue,:act_as_forge_activity, :act_as_forge_message
-  after_update :be_user_score, :act_as_forge_message_update
+  after_update :be_user_score
   after_destroy :down_user_score
   # after_create :be_user_score
   # end
@@ -150,11 +150,11 @@ class Issue < ActiveRecord::Base
   end
 
   # 更新缺陷
-  def act_as_forge_message_update
-    unless self.author_id == self.assigned_to_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
-    end
-  end
+  #def act_as_forge_message_update
+  #  unless self.author_id == self.assigned_to_id
+  #    self.forge_messages << ForgeMessage.new(:user_id => self.assigned_to_id, :project_id => self.project_id, :viewed => false)
+  #  end
+  #end
   
   
   # Returns a SQL conditions string used to find all issues visible by the specified user
diff --git a/app/models/journal.rb b/app/models/journal.rb
index a5bea92af..3a9f5a89d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -172,9 +172,10 @@ class Journal < ActiveRecord::Base
   # 缺陷状态更改，消息提醒
   def act_as_forge_message
     if self.user_id != self.issue.author_id
-      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id,
-                                              :project_id => self.issue.project_id,
-                                              :viewed => false)
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false)
+    end
+    if self.user_id != self.issue.assigned_to_id   # 指派人不是自己的话，则给指派人发送
+      self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false)
     end
   end
 
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index fd979faf9..8b2106f5a 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -133,7 +133,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">与我相关问题</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派了问题给你</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",:title => "#{ma.forge_message.subject}" %></a>
                           </li>
@@ -149,7 +149,7 @@
                             <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue" %>
                           </li>
                           <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                            更新了问题
+                            更新了问题状态
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to get_issue_des_update(ma.forge_message),
                                         issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
@@ -163,7 +163,7 @@
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %></li>
 
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布帖子" : "回复帖子" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了帖子" : "回复了帖子" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project,
                                                                                                :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
@@ -180,7 +180,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
                           </li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布新闻</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了新闻</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ("#{ma.forge_message.title.html_safe}"), {:controller => 'news', :action => 'show', :id => ma.forge_message.id}, :class => "newsGrey", :title => "#{ma.forge_message.title.html_safe}" %></a>
                           </li>

From 0007b720b3bfd681afe8f06204e9e9e7bb190bc0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 26 Aug 2015 09:01:02 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 8b2106f5a..e48c5f4be 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -15,8 +15,8 @@
             <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %></a></li>
             <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %></a></li>
             <%# 项目相关消息 %>
-            <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "相关问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
-            <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
+            <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "指派问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
+            <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "问题更新",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
             <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %></a></li>
             <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %></a></li>
             <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'} %></a></li>
@@ -39,7 +39,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了通知</li>
                           <li class="homepageNewsContent fl">
                             <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
                                         :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
@@ -63,7 +63,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布作业</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了作业</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),:class => "newsGrey", :title => "#{ma.course_message.name}" %></a></li>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_at).html_safe %> </li>
@@ -73,7 +73,7 @@
                         <ul class="homepageNewsList fl">
                           <li class="homepageNewsPortrait fl"><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) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue" %></a></li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了问卷</li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
                                         :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
@@ -86,14 +86,14 @@
                           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                           <li class="homepageNewsPublisher fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue" %></li>
                           <% if ma.course_message.parent_id.nil? %>
-                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
+                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布了帖子</li>
                               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                                 <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
                                                                                                    :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
                                            :title => "#{ma.course_message.subject.html_safe}" %></a></li>
                               <li class="homepageNewsTime fl"><%= time_tag(ma.course_message.created_on).html_safe %> </li>
                           <% else %>
-                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
+                              <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复了帖子</li>
                               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                                 <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
                                                                                                    :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
@@ -209,7 +209,7 @@
                           <li class="homepageNewsPublisher fl">
                             <%=link_to ma.memo.author, user_path(ma.memo.author), :class => "newsBlue" %>
                           </li>
-                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "新建贴吧帖子" : "回复贴吧帖子" %></li>
+                          <li class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子" : "回复了贴吧帖子" %></li>
                           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                             <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %></a>
                           </li>
@@ -239,7 +239,7 @@
         <% end %>
         <!--项目消息-->
     <% else %>
-        <div class="flash notice">暂无消息！</div>
+        <div class="flash notice">您目前还没有相关消息！</div>
     <% end %>
     <div class="cl"></div>
     </div>