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

fix sorting error

This commit is contained in:
chiu 2020-03-04 18:39:21 +08:00
parent 89c065b047
commit e2f03069d0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/announcements_controller.rb
View File

@ -147,7 +147,7 @@ class AnnouncementsController < ApplicationController
else else
feeds_anns = get_feed_announcements("widget") feeds_anns = get_feed_announcements("widget")
rest_all_anns = feeds_anns + sorted_anns.select{|v| !v.is_top}.take(rest_count).map{|v| data_to_human_type(v)} rest_all_anns = feeds_anns + sorted_anns.select{|v| !v.is_top}.take(rest_count).map{|v| data_to_human_type(v)}
rest_anns = rest_all_anns.sort_by{|v| v["postdate"]}.take(rest_count) rest_anns = rest_all_anns.sort{|v1,v2| v2["postdate"]<=>v1["postdate"]}.take(rest_count)
anns = top_anns + rest_anns anns = top_anns + rest_anns
end end
end end

4
lib/announcement/engine.rb
View File

@ -35,6 +35,10 @@ module Announcement
data[key1] = [value1,value2,value3] data[key1] = [value1,value2,value3]
data_item[key_item1] = [value_item1,value_item2,value_item3] data_item[key_item1] = [value_item1,value_item2,value_item3]
data_item[key_item2] = [value2_item1,value2_item2] data_item[key_item2] = [value2_item1,value2_item2]
require File.expand_path('../../../app/models/anns_cache', __FILE__)
if defined? AnnsCache
AnnsCache.all.destroy
end
rescue => e rescue => e
puts ['error in announcement',e] puts ['error in announcement',e]
end end