From 541408064630e048624a9ea82b6a915febc0431b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 29 Jul 2016 21:21:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E6=8B=92=E7=BB=9D=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E5=86=8D?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 4f34bb252..46b5d812d 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -103,7 +103,7 @@ class MembersController < ApplicationController
     # 发送消息给拒绝者
     AppliedMessage.create(:user_id => @applied_message.user_id, :applied_type => "AppliedProject", :applied_id => applied_project.id ,:status => 5,
                             :viewed => true, :applied_user_id => @applied_message.applied_user_id, :role => applied_project.role, :project_id => applied_project.project_id)
-    # applied_project.delete
+    applied_project.delete
   end
 
   def create
@@ -370,6 +370,11 @@ class MembersController < ApplicationController
             grade.destroy
           end
         end
+        # 移出的时候删除申请消息,不需要删除消息，所以不必要关联删除
+        applied_projects = AppliedProject.where(:project_id => @project.id, :user_id => @member.user_id).first
+        unless applied_projects.nil?
+          applied_projects.delete
+        end
         #移出项目发送消息
         ForgeMessage.create(:user_id => @member.user_id, :project_id => @project.id, :forge_message_type => "RemoveFromProject", :viewed => false, :forge_message_id => User.current.id)
       end