From d1352742812abf798581dc16c769ae072a20998c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 26 Jan 2015 15:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=A4=8D=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/applied_project_controller.rb         | 4 +++-
 app/views/applied_project/applied_join_project.js.erb | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/controllers/applied_project_controller.rb b/app/controllers/applied_project_controller.rb
index d7b65174f..f5c42f7b4 100644
--- a/app/controllers/applied_project_controller.rb
+++ b/app/controllers/applied_project_controller.rb
@@ -10,8 +10,10 @@ class AppliedProjectController < ApplicationController
         if  @applieds.count == 0
           appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
           Mailer.applied_project(appliedproject).deliver
+          @status = 2
+        else
+          @status = 1
         end
-        @status = 1
       else
         @status = 0
       end
diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
index 9fd358ede..deac2c9ce 100644
--- a/app/views/applied_project/applied_join_project.js.erb
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -1,6 +1,8 @@
 <% if @status == 0%>
     alert("您申请的项目不存在");
 <% elsif @status == 1%>
+    alert("请勿重复申请加入该项目");
+<% elsif @status == 2%>
     alert("申请成功");
 <%else%>
     alert("申请失败");