diff --git a/app/controllers/admin/bulletins_controller.rb b/app/controllers/admin/bulletins_controller.rb index fa3e175..96d5a0c 100644 --- a/app/controllers/admin/bulletins_controller.rb +++ b/app/controllers/admin/bulletins_controller.rb @@ -22,6 +22,7 @@ class Admin::BulletinsController < ApplicationController 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]) + bulletins = bulletins.where(:approved.ne => false , :rejected.ne => true) bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page) @@ -82,6 +83,7 @@ class Admin::BulletinsController < ApplicationController bulletin_count = Bulletin.all end bulletin_count = bulletin_count.where(:is_preview.in=>[false,nil]) + bulletin_count = bulletin_count.where(:approved.ne => false , :rejected.ne => true) total_pages = bulletin_count.count # End diff --git a/app/views/admin/announcements/_form.html.erb b/app/views/admin/announcements/_form.html.erb index 21b91a3..e252e6d 100644 --- a/app/views/admin/announcements/_form.html.erb +++ b/app/views/admin/announcements/_form.html.erb @@ -226,10 +226,13 @@ <% content_for :page_specific_javascript do %>