Merge branch 'design_team' into ldap

app/controllers/admin/object_auths_new_interface_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ObjectAuthsNewInterfaceController < ApplicationController
+class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   include OrbitCoreLib::PermissionUnility
   layout "new_admin"
   before_filter :force_order
@@ -33,8 +33,9 @@ class Admin::ObjectAuthsNewInterfaceController < ApplicationController
 
   protected
   def update_setting_by_params
+    user_sat = []
     oa = ObjectAuth.find params[:ob_auth][:id]
-    user_sat = User.find params[:users].keys
+    user_sat += User.find params[:users].keys if params.has_key? :users
     users_to_new = user_sat - oa.auth_users
     users_to_remove = oa.auth_users - user_sat