changes for ad_banner

app/controllers/admin/ad_banners_controller.rb

@@ -1,17 +1,10 @@
 class Admin::AdBannersController < OrbitBackendController
+  
   open_for_visitor :only => [:index, :show]
-  open_for_manager :except => [:index,:show,:update,:realtime_preview]
-  open_for_sub_manager :except => [:index, :show]
+  open_for_sub_manager
 
-  def rename
-    @ad_banner = AdBanner.find(params[:id])
-    @ad_banner.title = params[:body]
-    render :json => {:success =>@ad_banner.save!}
-  end
-  def destroy
-    @ad_banner = AdBanner.find(params[:id])
-    @ad_banner.destroy
-    redirect_to admin_ad_banners_url
+  def index
+    @ad_banners = AdBanner.all.page(params[:page]).per(10)
   end
   
   def show
@@ -28,13 +21,10 @@ class Admin::AdBannersController < OrbitBackendController
   def create
     @ad_banner = AdBanner.new(params[:ad_banner])
     if @ad_banner.save
-      @active = @ad_banner
       redirect_to admin_ad_banners_url
-      #respond_to do |format|
-      #  format.js {render 'new_created_node'}
-      #end
     else
-      render  'create_error_msg'
+      @ad_banner = AdBanner.new(params[:ad_banner])
+      render :new
     end
   end
   
@@ -45,20 +35,17 @@ class Admin::AdBannersController < OrbitBackendController
   
   def update
     @ad_banner = AdBanner.find(params[:id])    
-    @ad_banner.update_attributes(params[:ad_banner])
-    @ad_banner.save
+    if @ad_banner.update_attributes(params[:ad_banner])
+      redirect_to admin_ad_banners_url
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @ad_banner = AdBanner.find(params[:id])
+    @ad_banner.destroy
     redirect_to admin_ad_banners_url
   end
   
-  def realtime_preview
-    @ad_banner = AdBanner.find( params[:id] ).preview_clone
-    @ad_banner.update_attributes(params[:ad_banner])#.update_attributes(params[:ad_images])
-  end
-  
-  def index
-    @ad_banners = AdBanner.all
-    @active = @ad_banners.first
-    @tags = get_tags
-  end
-  
 end

app/controllers/admin/ad_images_controller.rb

@@ -1,62 +1,56 @@
 class Admin::AdImagesController < Admin::AdBannersController
-  
-  # before_filter :force_order_for_user
-  # before_filter :for_app_sub_manager
-  # before_filter :for_app_manager
-  
+
+  before_filter :only => [ :new, :edit ] do
+    @ad_banners = AdBanner.all
+    @tags = get_tags
+  end
+
   def initialize
     super
     @app_title = "ad_banner"
   end
 
   def index
-    #@ad_banner = AdBanner.find params[:ad_banner_id]
-    #@ad_images = @ad_banner.ad_images.all.page(params[:page]).per(10)
-    @ad_images =  AdImage.all.page(params[:page]).per(10)
+    @ad_images = AdImage.all.page(params[:page]).per(10)
   end
 
   def edit
-    #@ad_banner = AdBanner.find params[:ad_banner_id]
     @ad_image = AdImage.find(params[:id])
-    @tags = get_tags
   end
   
   def update
-    @ad_banner = AdBanner.find params[:ad_banner][:id]
-    @ad_image = AdImage.find(params[:ad_image][:id])
-    @ad_image.update_attributes(params[:ad_image])
-    @ad_banner.ad_images << @ad_image
-    redirect_to  admin_ad_images_path
+    @ad_image = AdImage.find(params[:id])
+    if @ad_image.update_attributes(params[:ad_image])
+      redirect_to admin_ad_images_url
+    else
+      @ad_banners = AdBanner.all
+      @tags = get_tags
+      render action: :edit
+    end
   end
   
-  def new
-    #ad_banner = AdBanner.find params[:ad_banner_id]
-    #@ad_image =ad_banner.ad_images.build 
+  def new 
     @ad_image = AdImage.new
-    @ad_image.post_date = Date.today
-    @ad_image.unpost_date = Date.today + 30
-    @tags = get_tags
-    #render :action => 'new',:url=> {:ad_banner_id => params.has_key?(:ad_banner_id)? params[:ad_banner_id],nil}
+    @ad_image.postdate = Date.today
+    @ad_image.deadline = Date.today + 30
   end
   
   def create
-    @ad_banner = AdBanner.find params[:ad_banner][:id]
-    @ad_image = AdImage.new  params[:ad_image]
-    @ad_image.to_save = true
-    @ad_banner.ad_images << @ad_image
-
+    @ad_image = AdImage.new(params[:ad_image])
     if @ad_image.save
-      redirect_to admin_ad_images_path
+      redirect_to admin_ad_images_url
+    else
+      @ad_banners = AdBanner.all
+      @tags = get_tags
+      @ad_image = AdImage.new(params[:ad_image])
+      render action: :new
     end
-
   end
   
   def destroy
-    #@ad_banner = AdBanner.find params[:ad_banner_id]
     @ad_image = AdImage.find params[:id]
     if @ad_image.destroy
-      flash[:notice] = t('ad.success_destroy_ad_image')
-      redirect_to admin_ad_images_path
+      redirect_to admin_ad_images_url
     end
   end
   

app/controllers/admin/tags_controller.rb

@@ -1,6 +1,7 @@
 class Admin::TagsController < OrbitBackendController
   include OrbitTag::Merging
 
+  open_for_user only: [:index]
   open_for_manager
    
   def index