fixed json for nccu
This commit is contained in:
parent
eacafbcc86
commit
fc35327d11
|
@ -15,7 +15,7 @@ class Admin::NewsbulletinsController < ApplicationController
|
||||||
keyword = Regexp.new(".*"+params[:keyword]+".*")
|
keyword = Regexp.new(".*"+params[:keyword]+".*")
|
||||||
bulletins = NewsBulletin.any_of({:title=>keyword},{:subtitle=>keyword},{:text=>keyword})
|
bulletins = NewsBulletin.any_of({:title=>keyword},{:subtitle=>keyword},{:text=>keyword})
|
||||||
else
|
else
|
||||||
bulletins = NewsBulletin.all
|
bulletins = NewsBulletin.all.can_display
|
||||||
end
|
end
|
||||||
|
|
||||||
bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank?
|
bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank?
|
||||||
|
|
Loading…
Reference in New Issue