From f2b8335912c918facd7e47bd11064a8dc704ab80 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Dec 2015 13:48:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=87=BA=E6=88=90=E5=91=98=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4=E8=80=8C=E5=BC=95?=
 =?UTF-8?q?=E8=B5=B7=E7=9A=84400=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_forge.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 4e42cd5ae..967941a88 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -57,6 +57,7 @@
     <% end %>
     <!--被管理员移出项目-->
     <% if ma.forge_message_type == "RemoveFromProject" %>
+      <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
             <a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id) %></a>
@@ -87,6 +88,7 @@
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
+      <% end %>
     <% end %>
     <!--邀请加入项目-->
     <% if ma.forge_message_type == "ProjectInvite" %>