From 5c2ac3e02fed0990f49b611275da5bfd56099c10 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 27 Jun 2016 15:47:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_member_controller.rb          | 4 ++++
 app/views/org_member/deleteOrgMember.js.erb       | 3 +++
 app/views/organizations/_org_member_list.html.erb | 6 ++++--
 config/routes.rb                                  | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 app/views/org_member/deleteOrgMember.js.erb

diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb
index 642a100c3..2eaa790cd 100644
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@@ -54,4 +54,8 @@ class OrgMemberController < ApplicationController
   def index
 
   end
+
+  def deleteOrgMember
+    destroy
+  end
 end
diff --git a/app/views/org_member/deleteOrgMember.js.erb b/app/views/org_member/deleteOrgMember.js.erb
new file mode 100644
index 000000000..d87e62c17
--- /dev/null
+++ b/app/views/org_member/deleteOrgMember.js.erb
@@ -0,0 +1,3 @@
+$("#org_members_count_id").html("");
+$("#org_members_count_id").html("<%= @org.org_members.count %>")
+$("#org_member_list").html('<%= escape_javascript( render :partial=>"organizations/org_member_list",:locals=> {:members=>@org.org_members}) %>');
\ No newline at end of file
diff --git a/app/views/organizations/_org_member_list.html.erb b/app/views/organizations/_org_member_list.html.erb
index 8e8a23b60..8af7986fc 100644
--- a/app/views/organizations/_org_member_list.html.erb
+++ b/app/views/organizations/_org_member_list.html.erb
@@ -1,6 +1,7 @@
 <% members.each do |member|%>
     <ul class="orgListRow">
-      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname  %></a></li>
+      <% username = User.find(member.user_id).realname.blank? ? User.find(member.user_id).login : User.find(member.user_id).realname %>
+      <li class="orgListUser hidden"><a href="<%= user_url_in_org(member.user_id) %>" class="linkBlue"><%= username %></a></li>
       <li class="orgListRole">
         <%= get_org_member_role_name member %>
         <%= form_for(member, {:as => :org_member, :remote => true, :url => Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,
@@ -32,7 +33,8 @@
       </li>
         <% if ( (User.current.id == member.organization.creator_id || User.current.admin_of_org?(member.organization) ) && member.user_id != member.organization.creator_id )%>
         <a href="javascript:void(0);" style="color: #0781B4;margin-left: 30px;float: left"  onclick="$(this).parent().height();$('#org-member-<%= member.id%>-roles-form').show();">编辑</a>
-            <%= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
+          <a href="javascript:void(0)" style = "color: #0781B4;margin-left: 30px;float: left" onclick = "ifDeleteOrgMember('<%= member.id %>','<%= username %>')" >删除</a>
+          <%#= link_to '删除',  Setting.protocol + "://" + Setting.host_name + "/org_member/" + member.id.to_s,:method=>'delete',:style=>'color: #0781B4;margin-left: 30px;float: left',:confirm=>'您确定要删除么?', :remote => true %><% end %>
       <div class="cl"></div>
     </ul>
     <div class="cl"></div>
diff --git a/config/routes.rb b/config/routes.rb
index ec8fa2337..189c2671d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -116,6 +116,7 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       get 'org_member_autocomplete'
+      get 'deleteOrgMember'
     end
   end
 

From dd397a060b67f292841e58fce8dbfc1d3f26d795 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 27 Jun 2016 15:48:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=B7=A8=E5=9F=9F=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/javascripts/application.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a2f14332d..f5edb5ef4 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1504,4 +1504,18 @@ function edit_file_description(url,id){
         }
     );
 }
+//删除组织成员
+function ifDeleteOrgMember(id,name){
+    var htmlvalue = "</br><div style='width:550px;text-align:center'>您确定要删除"+name+"吗?</div></br><div style='width:164px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn fl' onclick='deleteOrgMember("+id+")'>确定</a><a href='javascript:void(0);' class='Blue-btn fl' onclick='hideModal()'>取消</a></div>" +
+        "<script>function deleteOrgMember(id){" +
+        "$.ajax({\n\
+            url: '/org_member/deleteOrgMember',\n\
+            type: 'get',\n\
+            dataType: 'jsonp',\n\
+            data: {id:id},\n\
+            success: function(data){},\n\
+        });\n\
+        hideModal();}</script>";
+    pop_up_box(htmlvalue,580,30,50);
+}