diff --git a/app/controllers/admin/newsbulletins_controller.rb b/app/controllers/admin/newsbulletins_controller.rb index 0a80e5a..65b3a74 100644 --- a/app/controllers/admin/newsbulletins_controller.rb +++ b/app/controllers/admin/newsbulletins_controller.rb @@ -19,6 +19,8 @@ class Admin::NewsbulletinsController < ApplicationController end bulletins = bulletins.where(:is_hot => params[:is_hot]) if !params[:is_hot].blank? + bulletins = bulletins.where(:is_hidden => false) + bulletins = bulletins.where(:category_id.in => params[:categories]) if !params[:categories].blank? bulletins = bulletins.where(:tagged_ids.in => params[:tags]) if !params[:tags].blank? bulletins = bulletins.where(:is_preview.in=>[false,nil]) diff --git a/app/views/admin/news/_form.html.erb b/app/views/admin/news/_form.html.erb index d074ef2..c91e4b4 100644 --- a/app/views/admin/news/_form.html.erb +++ b/app/views/admin/news/_form.html.erb @@ -151,13 +151,16 @@