diff --git a/app/assets/javascripts/lib/ad_banner/banner_preview.js b/app/assets/javascripts/lib/ad_banner/banner_preview.js index d740ebe..5a374a7 100644 --- a/app/assets/javascripts/lib/ad_banner/banner_preview.js +++ b/app/assets/javascripts/lib/ad_banner/banner_preview.js @@ -32,7 +32,6 @@ function preview() { var resize = 500/bannerW bannerW = Math.floor(bannerW*resize); bannerH = Math.floor(bannerH*resize); - console.log(bannerW) }; if(bannerH > 300) { var resize = 300/bannerH diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb index 780e525..8ce0211 100644 --- a/app/controllers/admin/ad_banners_controller.rb +++ b/app/controllers/admin/ad_banners_controller.rb @@ -4,7 +4,7 @@ class Admin::AdBannersController < OrbitBackendController open_for_sub_manager def index - @ad_banners = AdBanner.all.page(params[:page]).per(10) + @ad_banners = get_sorted_and_filtered("ad_banner") end def show diff --git a/app/controllers/admin/ad_images_controller.rb b/app/controllers/admin/ad_images_controller.rb index 35dc6c5..cfd44a5 100644 --- a/app/controllers/admin/ad_images_controller.rb +++ b/app/controllers/admin/ad_images_controller.rb @@ -11,7 +11,7 @@ class Admin::AdImagesController < Admin::AdBannersController end def index - @ad_images = AdImage.all.page(params[:page]).per(10) + @ad_images = get_sorted_and_filtered("ad_image") end def edit diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aff31a7..27555cf 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -321,6 +321,8 @@ class ApplicationController < ActionController::Base sorted_objects.flatten! sorted_objects.uniq! objects = get_with_nil(objects, option, sorted_objects) + elsif option.eql?('size') + objects = objects.order_by([ [:width, params[:direction]], [:height, params[:direction]] ]) end end end @@ -361,8 +363,12 @@ class ApplicationController < ActionController::Base end if pagination - # Kaminari.paginate_array(filter_authorized_objects(objects)).page(params[:page]).per(10) - filter_authorized_objects(objects).page(params[:page]).per(10) + filtered_objects = filter_authorized_objects(objects) + if filtered_objects.is_a?(Array) + Kaminari.paginate_array(filtered_objects).page(params[:page]).per(10) + else + filter_authorized_objects(objects).page(params[:page]).per(10) + end else filter_authorized_objects(objects) end