Merge branch 'design_team' into ldap

app/controllers/admin/ad_banners_controller.rb

@@ -1,8 +1,14 @@
 class Admin::AdBannersController < OrbitBackendController
   layout "new_admin"
   before_filter :authenticate_user!
-  before_filter :for_app_manager
+  before_filter :for_app_manager,:except => [:index,:show] 
+  before_filter :for_app_sub_manager
 
+  def rename
+    @ad_banner = AdBanner.find(params[:id])
+    @ad_banner.title = Nokogiri::HTML.fragment(params["body"]).at("a").children().to_s
+    render :json => {:success =>@ad_banner.save!}
+  end
   def destroy
     @ad_banner = AdBanner.find(params[:id])
     @ad_banner.destroy

app/controllers/admin/module_apps_new_interface_controller.rb

@@ -1,4 +1,4 @@
-class Admin::ModuleAppsNewInterfaceController < ApplicationController
+class Admin::ModuleAppsNewInterfaceController < OrbitBackendController
   before_filter :authenticate_user!
   before_filter :is_admin?
   include AdminHelper
@@ -25,9 +25,9 @@ class Admin::ModuleAppsNewInterfaceController < ApplicationController
   def update_setting
     module_app = update_setting_by_params
     if module_app.save!
-      flash[:notice] = "Update Done"
+      flash[:notice] = t("admin.object_auth.update_done")
     else
-      flash[:notice] = "Update Failed"
+      flash[:notice] = t("admin.object_auth.update_failed")
     end
   end
   
@@ -37,8 +37,9 @@ class Admin::ModuleAppsNewInterfaceController < ApplicationController
 
   protected
   def update_setting_by_params
+    user_sat = []
     ma = ModuleApp.find params[:module_app][: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 - ma.managing_users
     users_to_remove = ma.managing_users - user_sat
 

app/controllers/admin/object_auths_new_interface_controller.rb

@@ -1,6 +1,5 @@
 class Admin::ObjectAuthsNewInterfaceController < OrbitBackendController
   include OrbitCoreLib::PermissionUnility
-
   before_filter :force_order