From 88d562450a649af9ec97f471e64d3b9121e452a2 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Fri, 21 Sep 2012 15:34:18 +0800 Subject: [PATCH] Fix home banner for hot news --- vendor/built_in_modules/news/app/models/news_bulletin.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/built_in_modules/news/app/models/news_bulletin.rb b/vendor/built_in_modules/news/app/models/news_bulletin.rb index e00c3e9bd..3c3258405 100644 --- a/vendor/built_in_modules/news/app/models/news_bulletin.rb +++ b/vendor/built_in_modules/news/app/models/news_bulletin.rb @@ -154,9 +154,9 @@ class NewsBulletin # any_of({ :title => "test" },{:deadline => nil, :title => "123"}) if category_id.to_s.size > 0 - find(:all, :conditions => {news_bulletin_category_id: category_id}).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate) + find(:all, :conditions => {news_bulletin_category_id: category_id}).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).where(is_hot: true).desc(:postdate) else - any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate) + any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).where(is_hot: true).desc(:postdate) end end