From 4d246de1c64c3fe80117bf617d2e214c8604d83e Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 16 Oct 2015 15:07:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E8=A2=AB=E6=8B=89=E5=85=A5?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E7=A7=BB=E5=87=BA=E6=9F=90=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=B9=E5=BA=94=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=BD=93=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E6=9D=83=E9=99=90=EF=BC=8C=E5=BA=94=E7=BB=99=E5=87=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb |  2 +-
 app/views/users/_user_message_forge.html.erb  | 38 +++++++++++++------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index d9b4f7a3d..36318c20b 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -102,7 +102,7 @@
                 <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                 <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;@&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
                 <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                 <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
             <% else %>
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index a7777a59a..9a9bec10d 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -36,12 +36,19 @@
                         :onmouseout => "message_titile_hide($(this))" %></a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              项目名称：<%= ma.project.name %>
-            </p>
-            <p>
-              项目描述：<%= ma.project.description %>
-            </p>
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+                <p>
+                  项目名称：<%= ma.project.name %>
+                </p>
+
+                <p>
+                  项目描述：<%= ma.project.description %>
+                </p>
+            <% else %>
+                <p>
+                  您已经被移出该私有项目，非项目成员没有权限访问私有项目
+                </p>
+            <% end %>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
@@ -62,12 +69,19 @@
                         :onmouseout => "message_titile_hide($(this))" %></a>
           </li>
           <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              项目名称：<%= ma.project.name %>
-            </p>
-            <p>
-              项目描述：<%= ma.project.description %>
-            </p>
+            <% if ma.project.is_public? || User.current.member_of?(ma.project) %>
+                <p>
+                  项目名称：<%= ma.project.name %>
+                </p>
+
+                <p>
+                  项目描述：<%= ma.project.description %>
+                </p>
+            <% else %>
+                <p>
+                  您已经被移出该私有项目，非项目成员没有权限访问私有项目
+                </p>
+            <% end %>
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>