From 9e5d5cf0950af8b26bfae0e6f3e2c2fb8658dd6e Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 27 Apr 2016 18:59:29 +0800 Subject: [PATCH] small fix for top anns while filtering --- app/controllers/announcements_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index 285c28e..86d59ba 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -18,7 +18,7 @@ class AnnouncementsController < ApplicationController end end - if OrbitHelper.page_number == 1 or OrbitHelper.page_number.nil? + if OrbitHelper.page_number == 1 or OrbitHelper.page_number.nil? && !params["source"].present? top_anns = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil], :is_top => true).and(:title.ne => nil).can_display.filter_by_categories([],false).to_a end if !feeds_anns.blank?