developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated AdBanner index page and Ad Image index page, and edit pages

Browse Source 
Conflicts:
	vendor/built_in_modules/ad_banner/config/locales/en.yml
	vendor/built_in_modules/ad_banner/init.rb
This commit is contained in:
saurabhbhatia committed 2013-08-09 15:22:06 +08:00
1 parent e14cb3c74c
commit 7c64e8c637
14 files changed
+180 -156
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/ad_images_controller.rb
+19 -20
View File
@@ -10,28 +10,27 @@ class Admin::AdImagesController < Admin::AdBannersController
end
def index
@ad_banner = AdBanner.find params[:ad_banner_id]
@ad_images = @ad_banner.ad_images.all.page(params[:page]).per(10)
#@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)
end
def edit
@ad_banner = AdBanner.find params[:ad_banner_id]
@ad_image = @ad_banner.ad_images.find params[:id]
#@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[:id]
@ad_image = AdImage.find(params[:id])
@ad_image.update_attributes(params[:ad_image])
@ad_image.to_save = true
@ad_image.save!
redirect_to admin_ad_banner_path @ad_banner
redirect_to admin_ad_images_path
end
def new
ad_banner = AdBanner.find params[:ad_banner_id]
@ad_image =ad_banner.ad_images.build
#ad_banner = AdBanner.find params[:ad_banner_id]
#@ad_image =ad_banner.ad_images.build
@ad_image = AdImage.new
@ad_image.post_date = Date.today
@ad_image.unpost_date = Date.today + 30
@tags = get_tags
@@ -39,23 +38,23 @@ class Admin::AdImagesController < Admin::AdBannersController
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_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
if @ad_banner.save!
redirect_to admin_ad_banner_path @ad_banner
if @ad_image.save
redirect_to admin_ad_images_path
end
end
def destroy
@ad_banner = AdBanner.find params[:ad_banner_id]
@ad_image = @ad_banner.ad_images.find params[:id]
#@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_banner_path @ad_banner
redirect_to admin_ad_images_path
end
end