leo
/
announcement-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fix

This commit is contained in:
Harry Bomrah 2016-04-27 19:05:10 +08:00
parent c319e600a3
commit 8e9e1f1609
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/announcements_controller.rb
View File

@ -18,9 +18,11 @@ class AnnouncementsController < ApplicationController
end end
end end
if (OrbitHelper.page_number == 1 or OrbitHelper.page_number.nil?) && !params["source"].present? if !params["source"].present?
if (OrbitHelper.page_number == 1 or OrbitHelper.page_number.nil?)
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 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 end
end
if !feeds_anns.blank? if !feeds_anns.blank?
announcements = announcements.concat(feeds_anns) announcements = announcements.concat(feeds_anns)
sorted = announcements.sort{ |k,v| v["postdate"] <=> k["postdate"] } sorted = announcements.sort{ |k,v| v["postdate"] <=> k["postdate"] }