From 636776d342ace9a4f105a8da55f45bf257609b86 Mon Sep 17 00:00:00 2001 From: nccu Date: Thu, 13 Nov 2014 10:05:41 +0800 Subject: [PATCH] update homepage show --- app/controllers/news_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 71bdc60..510e74e 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -99,8 +99,9 @@ class NewsController < ApplicationController def widget params = OrbitHelper.params - !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:postdate=>"desc"} - news = NewsBulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).is_approved.order_by(:created_at=>'desc').filter_by_widget_categories.filter_by_tags(OrbitHelper.widget_tags) if news.nil? + !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:is_hot=>"desc",:postdate=>"desc"} + news = NewsBulletin.where(:title.ne => "",:is_preview.in=>[false,nil]).is_approved.order_by(sort).filter_by_widget_categories if news.nil? + page = Page.where(:module => "news").first rescue nil ma = ModuleApp.find_by_key("news") rescue nil categories = ma.categories.enabled.collect do |cat|