From 6273300c28915096dcaec76707dfb55202990634 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 20 Nov 2012 15:47:07 +0800 Subject: [PATCH] Fix for ad_image --- app/controllers/admin/ad_images_controller.rb | 13 +++++++++---- app/controllers/orbit_backend_controller.rb | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb index 0ae61ec6..fc25c5d5 100644 --- a/app/controllers/admin/ad_images_controller.rb +++ b/app/controllers/admin/ad_images_controller.rb @@ -1,8 +1,13 @@ -class Admin::AdImagesController < OrbitBackendController +class Admin::AdImagesController < Admin::AdBannersController - before_filter :force_order_for_user - before_filter :for_app_sub_manager - before_filter :for_app_manager + # before_filter :force_order_for_user + # before_filter :for_app_sub_manager + # before_filter :for_app_manager + + def initialize + super + @app_title = "ad_banner" + end def edit @ad_banner = AdBanner.find params[:ad_banner_id] diff --git a/app/controllers/orbit_backend_controller.rb b/app/controllers/orbit_backend_controller.rb index 8f78ea62..530415ba 100644 --- a/app/controllers/orbit_backend_controller.rb +++ b/app/controllers/orbit_backend_controller.rb @@ -11,7 +11,7 @@ class OrbitBackendController < ApplicationController layout 'new_admin' def setup_vars - @app_title = controller_path.split('/')[1].singularize + @app_title ||= controller_path.split('/')[1].singularize @module_app ||= ModuleApp.first(conditions: {:key => @app_title} ) end