fix for bugs

This commit is contained in:
Matthew K. Fu JuYuan committed 2012-07-24 20:58:34 +08:00
1 parent 834fcddc52
commit 397b444390
2 files changed
+7 -3

No files matched your search

@@ -14,7 +14,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
search_cond.merge!({:bulletin_category_id => "#{params[:category_id]}" }) if !params[:category_id].blank?
search = Redis::Search.query("Bulletin", params[:search_query], :conditions =>search_cond)
search_result = search.collect{|t| t["id"]}
@news_bulletins = Bulletin.all.can_display.any_in(_id:search_result).page( params[:page_main]).per(10)
@bulletins = Bulletin.all.can_display.any_in(_id:search_result).page( params[:page_main]).per(10)
else
date_now = Time.now
if !params[:category_id].blank?