From 9dde668742a12c3975229dd5c08fb633f363cdde Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Jul 2015 16:02:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E4=BB=96=E4=BA=BA=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=8CTA=E7=9A=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AF=B9=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E7=9A=84=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=A1=B9=E7=9B=AE/=E5=8F=96=E6=B6=88?=
 =?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/views/applied_project/_set_applied.js.erb         |  4 +++-
 app/views/applied_project/applied_join_project.js.erb |  1 +
 app/views/users/user_projects.html.erb                | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/views/applied_project/_set_applied.js.erb b/app/views/applied_project/_set_applied.js.erb
index 33d862d1c..472da3c09 100644
--- a/app/views/applied_project/_set_applied.js.erb
+++ b/app/views/applied_project/_set_applied.js.erb
@@ -17,6 +17,8 @@ if (window.Messenger) {
   Messenger().post({
     id: "label_apply_project_waiting",
     message: "<%= l(:label_apply_project_waiting) %>",
-    showCloseButton: true,
+    showCloseButton: true
   });
 };
+
+$("#applied_project_link_<%= @project.id%>").replaceWith("<%= escape_javascript(link_to "加入项目",appliedproject_path(:user_id => User.current.id,:project_id => @project.id,:project_join => true),:class => "blue_n_btn fr mt20", :remote => "true",:method => "post",:id => "applied_project_link_#{@project.id}") %>");
diff --git a/app/views/applied_project/applied_join_project.js.erb b/app/views/applied_project/applied_join_project.js.erb
index 846d2a61d..ae9d3f467 100644
--- a/app/views/applied_project/applied_join_project.js.erb
+++ b/app/views/applied_project/applied_join_project.js.erb
@@ -6,6 +6,7 @@
 <% elsif @status == 2%>
     alert("<%= l('project.join.tips.success') %>");
     hideModal($("#popbox"));
+    $("#applied_project_link_<%= @project.id%>").replaceWith("<%=escape_javascript(link_to '取消申请',appliedproject_applied_path(:project_id => @project.id,:user_id => User.current.id),:class => "blue_n_btn fr mt20", :remote => "true",:method => "delete",:id => "applied_project_link_#{@project.id}")%>");
 <% elsif @status == 3%>
     alert("<%= l('project.join.tips.has') %>");
 <%else%>
diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb
index 42e665388..f54874aa3 100644
--- a/app/views/users/user_projects.html.erb
+++ b/app/views/users/user_projects.html.erb
@@ -41,7 +41,16 @@
             </tbody></table>
         </div>
       </div>
-      <a href="<%= url_for(:controller => 'issues', :action=>"new", :project_id=>item.id, :host=>Setting.host_name) %>" target="_blank" class="blue_n_btn fr mt20">发布问题</a>
+      <% if User.current.member_of? item%>
+          <a href="<%= url_for(:controller => 'issues', :action=>"new", :project_id=>item.id, :host=>Setting.host_name) %>" target="_blank" class="blue_n_btn fr mt20">发布问题</a>
+      <% elsif User.current.logged?%>
+          <% if item.applied_projects.find_by_user_id(User.current.id)%>
+              <%= link_to '取消申请',appliedproject_applied_path(:project_id => item.id,:user_id => User.current.id),:class => "blue_n_btn fr mt20", :remote => "true",:method => "delete",:id => "applied_project_link_#{item.id}"%>
+          <% else%>
+              <%= link_to "加入项目",appliedproject_path(:user_id => User.current.id,:project_id => item.id,:project_join => true),:class => "blue_n_btn fr mt20", :remote => "true",:method => "post",:id => "applied_project_link_#{item.id}" %>
+          <% end%>
+
+      <% end%>
       <div class="cl"></div>
     </div>
     <% end %>