From 17294ec7ae5efc8224b9400e9f03382f8c2399be Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 13 Jun 2015 09:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=EF=BC=9A?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=A4=B1=E8=B4=A5=E4=B8=8D=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/applied_project/applied_join_project.js.erb | 1 +
 app/views/projects/_join_project.html.erb             | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
index 491b8aa0f..846d2a61d 100644
--- a/app/views/applied_project/applied_join_project.js.erb
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -5,6 +5,7 @@
     alert("<%= l('project.join.tips.repeat') %>");
 <% elsif @status == 2%>
     alert("<%= l('project.join.tips.success') %>");
+    hideModal($("#popbox"));
 <% elsif @status == 3%>
     alert("<%= l('project.join.tips.has') %>");
 <%else%>
diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb
index 53c149f82..c650035f8 100644
--- a/app/views/projects/_join_project.html.erb
+++ b/app/views/projects/_join_project.html.erb
@@ -31,7 +31,6 @@
   <script type="text/javascript">
       function submit_form(obj)
       {
-          hideModal(obj);
           $("#new-watcher-form").submit();
 //          alert("申请成功");
       }