FIX merger

app/controllers/managements_controller.rb

@@ -1184,9 +1184,7 @@ end
     end
 
     @partners.each do |part|
-      if part.id == @current_partner.id
+      part.active = "active" if part.id == @current_partner.id
-        part.active = "active"
-      end
     end
   end
 
@@ -1299,7 +1297,7 @@ end
       end
     end
 
-    redirects_to
+    redirect_to partners_managements_path
   end
 
   # check 部门 identifier是否重复

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>