alex
/
nccu-news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix widget can_display

This commit is contained in:
nccu 2015-02-13 10:01:01 +08:00
parent bee93c327e
commit 2c72a8852d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/news_controller.rb
View File

@ -107,7 +107,7 @@ class NewsController < ApplicationController
def widget def widget
params = OrbitHelper.params params = OrbitHelper.params
!params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:is_top=>"desc",:postdate=>"desc"} !params[:sort].blank? ? sort = {params[:sort].to_sym=>params[:order]} : sort = {:is_top=>"desc",:postdate=>"desc"}
news = NewsBulletin.where(:title.ne => "",:is_preview.in=>[false,nil],:is_hot => true).is_approved.order_by(sort).filter_by_widget_categories if news.nil? news = NewsBulletin.where(:title.ne => "",:is_preview.in=>[false,nil],:is_hot => true).can_display.is_approved.order_by(sort).filter_by_widget_categories if news.nil?
page = Page.where(:module => "news").first rescue nil page = Page.where(:module => "news").first rescue nil
ma = ModuleApp.find_by_key("news") rescue nil ma = ModuleApp.find_by_key("news") rescue nil
@ -204,8 +204,8 @@ class NewsController < ApplicationController
"title" => HTMLEntities.new.encode(news.title), "title" => HTMLEntities.new.encode(news.title),
"category" => news.category.title, "category" => news.category.title,
"category-link" => "/#{I18n.locale.to_s + page.url}/?category=#{news.category.to_param}", "category-link" => "/#{I18n.locale.to_s + page.url}/?category=#{news.category.to_param}",
"unit" => news.unit.name, "unit" => (news.unit.name rescue ""),
"unit-link" => "/#{I18n.locale.to_s + page.url}/?unit=#{news.unit.to_param}", "unit-link" => "/#{I18n.locale.to_s + page.url}/?unit=#{(news.unit.to_param rescue "")}",
"department" => (department.name rescue ""), "department" => (department.name rescue ""),
"department-link" => "/#{I18n.locale.to_s + page.url}/?department=#{(department.to_param rescue "")}", "department-link" => "/#{I18n.locale.to_s + page.url}/?department=#{(department.to_param rescue "")}",
"update_user" => update_user, "update_user" => update_user,