diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb index 38f6388..5284e00 100644 --- a/app/controllers/admin/ad_banners_controller.rb +++ b/app/controllers/admin/ad_banners_controller.rb @@ -20,9 +20,9 @@ class Admin::AdBannersController < OrbitAdminController def show @banner = Banner.find(params[:id]) if params[:show] == "expired" - @images = @banner.ad_images.is_expired.asc(:sort_number).page(params[:page]).per(10) + @images = @banner.ad_images.is_expired.order_by(is_top: -1, sort_number: 1).page(params[:page]).per(10) else - @images = @banner.ad_images.not_expired.asc(:sort_number).page(params[:page]).per(10) + @images = @banner.ad_images.not_expired.order_by(is_top: -1, sort_number: 1).page(params[:page]).per(10) end @table_fields = [:banner, :title, "ad_banner.duration", :link] end diff --git a/app/models/ad_image.rb b/app/models/ad_image.rb index 07c815d..fd0cb94 100644 --- a/app/models/ad_image.rb +++ b/app/models/ad_image.rb @@ -19,6 +19,7 @@ class AdImage field :deadline , :type => DateTime field :youtube , :type => String field :sort_number, :type => Integer + field :is_top, :type => Boolean, :default => false field :language_enabled, :type => Array, :default => ["en","zh_tw"] field :exchange_item, :default => "1" LINK_OPEN_TYPES = ["local", "new_window"] diff --git a/app/views/admin/ad_banners/show.html.erb b/app/views/admin/ad_banners/show.html.erb index bcb5055..1b7927d 100644 --- a/app/views/admin/ad_banners/show.html.erb +++ b/app/views/admin/ad_banners/show.html.erb @@ -50,7 +50,10 @@ <% @images.each do |image| %> - + + <% if image.is_top? %> + <%= t(:top) %> + <% end %> <% if image.exchange_item == "1" %> <%= image_tag image.file.thumb, :class => "banner-image" %> <% elsif image.exchange_item == "2" %> @@ -115,11 +118,11 @@