From fed989753a73e0dd91060ced4dfa9d2655fed5fe Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Dec 2015 13:46:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9E=97=E5=A4=84=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E8=83=BD=E6=9F=A5=E7=9C=8B=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=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 | 4 +++-
 db/schema.rb                                 | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 94890a368..4e42cd5ae 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -22,6 +22,7 @@
     <% end %>
     <!--被管理员拉入项目-->
     <% if ma.forge_message_type == "JoinProject" %>
+      <% 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>
@@ -52,8 +53,9 @@
           </div>
           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
+      <% end %>
     <% end %>
-    <!-被管理员移出项目-->
+    <!--被管理员移出项目-->
     <% if ma.forge_message_type == "RemoveFromProject" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl">
diff --git a/db/schema.rb b/db/schema.rb
index 9ce76c447..91a9fbb5d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20151210110210) do
+ActiveRecord::Schema.define(:version => 20151209085942) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -459,7 +459,7 @@ ActiveRecord::Schema.define(:version => 20151210110210) do
     t.integer  "open_student",                  :default => 0
     t.integer  "outline",                       :default => 0
     t.integer  "publish_resource",              :default => 0
-    t.integer  "is_delete"
+    t.integer  "is_delete",                     :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -970,7 +970,6 @@ ActiveRecord::Schema.define(:version => 20151210110210) do
     t.integer  "course_group_id",   :default => 0
   end
 
-  add_index "members", ["course_id"], :name => "index_members_on_course_id"
   add_index "members", ["project_id"], :name => "index_members_on_project_id"
   add_index "members", ["user_id", "project_id", "course_id"], :name => "index_members_on_user_id_and_project_id", :unique => true
   add_index "members", ["user_id"], :name => "index_members_on_user_id"