From 3d408ac563a2c612b43627bbd92022d5f8b04bf0 Mon Sep 17 00:00:00 2001
From: jasder <jasder@jasderdeMacBook-Pro.local>
Date: Thu, 4 Apr 2019 11:48:08 +0800
Subject: [PATCH] FIX merger

---
 app/controllers/managements_controller.rb |  6 ++----
 app/views/managements/partners.html.erb   | 10 +---------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index 341ac98c..b6d0602a 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -1184,9 +1184,7 @@ end
     end
 
     @partners.each do |part|
-      if part.id == @current_partner.id
-        part.active = "active"
-      end
+      part.active = "active" if part.id == @current_partner.id
     end
   end
 
@@ -1299,7 +1297,7 @@ end
       end
     end
 
-    redirects_to
+    redirect_to partners_managements_path
   end
 
   # check 部门 identifier是否重复
diff --git a/app/views/managements/partners.html.erb b/app/views/managements/partners.html.erb
index c7ba2b8e..a7f55eed 100644
--- a/app/views/managements/partners.html.erb
+++ b/app/views/managements/partners.html.erb
@@ -24,7 +24,7 @@
               <span class="mr45 color-grey-9 fl">管理员</span>
               <ul class="manageList">
                 <li>
-                  <%= link_to '+', add_partner_member_box_managements_path(:partner => @current_partner), :remote => true, :class => "addManage" %>
+                  <%= link_to '+', add_partner_member_box_managements_path(:partner => 1), :remote => true, :class => "addManage" %>
                 </li>
 
                 <% unless @current_partner.nil? %>
@@ -77,14 +77,6 @@
             $(this).parents("li").remove();
         })
 
-        $(".manageList").on("click",".addManage",function(){
-            var html="<%= escape_javascript(render :partial => "managements/partner_addManage") %>";
-            pop_box_new(html,572,500);
-        })
-        $(".addOperation").on("click",function(){
-            var html="<%= escape_javascript(render :partial => "managements/partner_addUnit") %>";
-            pop_box_new(html,572,500);
-        })
 
     })
 </script>
\ No newline at end of file