From b207c231f7d8ad59e32c7f60f07730184338fa11 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 19 Sep 2015 16:18:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B6=88=E6=81=AF=E2=80=9C=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E5=8A=A0=E5=85=A5=E2=80=9D=E6=B7=BB=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8E=A7=E5=88=B6=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E4=B8=8D=E6=98=BE=E7=A4=BA=202=E3=80=81=E5=8C=BA?=
 =?UTF-8?q?=E5=88=AB=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E5=92=8C=E9=9D=9E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E7=9A=84=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=203=E3=80=81=E8=AE=BF=E9=97=AE=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=92=8C=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E5=88=99=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=BA=E5=B7=B2=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 11 ++++++++++-
 app/views/users/user_messages.html.erb |  8 ++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 71b852e01..95e90d416 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -259,7 +259,7 @@ class ProjectsController < ApplicationController
   # Author lizanle
   # Description  项目动态展示方法，删除了不必要的代码
   def show
-
+    update_invite_message(User.current, @project)
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
@@ -464,6 +464,8 @@ class ProjectsController < ApplicationController
   # by young
   # include CoursesHelper
   def member
+    # 更新消息状态
+    update_invite_message(User.current, @project)
     # 消息"同意加入项目"
     if params[:message_id]
       message_invite(params[:message_id], params[:key])
@@ -523,6 +525,13 @@ class ProjectsController < ApplicationController
     @members = paginateHelper @members
   end
 
+  def update_invite_message(user, project)
+    forge_invite_messages = ForgeMessage.where("user_id =? and project_id =? and forge_message_type =?", user, project, "ProjectInvite")
+    forge_invite_messages.each do |forge_invite_messages|
+      forge_invite_messages.update_attribute(:viewed, true)
+    end
+  end
+
   def message_invite(message_id, key)
     forge_message = ForgeMessage.find(message_id)
     if key == forge_message.secret_key
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 46964b14d..6445215d5 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -364,7 +364,11 @@
                         <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher" %>
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">邀请你加入项目：</span>
                       </li>
-                      <li class="homepageHomeworkContent fl">
+                      <% if ma.user.member_of?(ma.project) %>
+                        <li class="homepageNewsContent fl">
+                      <% else %>
+                        <li class="homepageHomeworkContent fl">
+                      <% end %>
                         <%= link_to ma.project, project_path(ma.project),
                                     :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                                     :onmouseover => "message_titile_show($(this),event)",
@@ -373,7 +377,7 @@
                       <div style="display: none" class="message_title_red system_message_style">
                         <%= ma.project %>
                       </div>
-                      <% if User.current == @user %>
+                      <% unless ma.user.member_of?(ma.project) %>
                       <li  class="homepageHomeworkContentWarn fl">
                         <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
                                    :value => ma.secret_key,