diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 76f5946e..efaeb074 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -1354,6 +1354,16 @@ end end end + # 合作伙伴删除管理员 + def delete_partner_member + if params[:partner] && params[:partner_member] + @partner = Partner.find_by_id params[:partner] + user = User.find_by_id params[:partner_member] + user.update_attributes(partner_id: nil) if !@partner.nil? && !user.nil? + end + end + + # check 部门 identifier是否重复 def check_depart_identifier logger.info("###############{params}") diff --git a/app/views/managements/delete_partner_member.js.erb b/app/views/managements/delete_partner_member.js.erb new file mode 100644 index 00000000..017b71b0 --- /dev/null +++ b/app/views/managements/delete_partner_member.js.erb @@ -0,0 +1 @@ +$("#partner_member_list").html("<%= j(render :partial => "partner_member_list", :locals => {partner: @partner}) %>") \ No newline at end of file diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb index 7ba9fecb..4b2850ad 100644 --- a/app/views/managements/partners.html.erb +++ b/app/views/managements/partners.html.erb @@ -68,11 +68,5 @@ $(".partnerList li a").removeClass("active"); $(this).addClass("active"); }) - - $(".removeImg").on("click",function(){ - $(this).parents("li").remove(); - }) - - }) \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index c3ac80c7..ff0be82f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -556,6 +556,7 @@ RedmineApp::Application.routes.draw do ## oauth相关 get 'partners' get 'add_partner_member_box' post 'add_partner_member' + delete 'delete_partner_member' get 'get_partner' get 'all_partners' post 'add_partner'