diff --git a/app/controllers/orbit_admin_controller.rb b/app/controllers/orbit_admin_controller.rb index 9e08844..6f060a7 100644 --- a/app/controllers/orbit_admin_controller.rb +++ b/app/controllers/orbit_admin_controller.rb @@ -12,8 +12,8 @@ class OrbitAdminController < ApplicationController case params[:sort] when "status" @sort = [[:is_top, params[:order]], - [:is_hot, params[:order]], - [:is_hidden,params[:order]]] + [:is_hot, params[:order]], + [:is_hidden,params[:order]]] when "category" @sort = {:category_id=>params[:order]} when "title" @@ -24,6 +24,21 @@ class OrbitAdminController < ApplicationController @sort = {:deadline=>params[:order]} when "last_modified" @sort = {:update_user_id=>params[:order]} + + when "banner" + @sort = {'banner_id'=>params[:order]} + when "banner_name" + @sort = {:title=>params[:order]} + when "effect" + @sort = {:ad_fx=>params[:order]} + when "transition_interval" + @sort = {:timeout=>params[:order]} + when "transition_speed" + @sort = {:speed=>params[:order]} + when "size" + @sort = {:height=>params[:order]} + when "link" + @sort = {:out_link=>params[:order]} end else @sort = {:created_at=>'desc'} diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index 6620a6c..b88fe1b 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -5,11 +5,15 @@ module OrbitBackendHelper end def thead(field) - active = params[:sort].eql? field.to_s + sort = field.to_s.include?('.') ? field.to_s.split('.')[1] : field.to_s + active = params[:sort].eql? sort order = active ? (["asc", "desc"]-[params[:order]]).first : "asc" arrow = (order.eql? "desc") ? "" : "" klass = field.eql?(:title) ? "span5" : "span2" - "#{t(field.to_sym)} #{active ? arrow : ""}".html_safe + + th_data = (sort=="preview") ? t(field.to_sym) : "#{t(field.to_sym)} #{active ? arrow : ""}" + + "#{th_data}".html_safe end def datetime_picker(object_name, method, options = {})