saurabh
/
announcement-test
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
chiu 2021-09-08 12:48:52 +08:00
parent 33bd85331f
commit c04c906eb4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/announcements_controller.rb
View File

@ -164,7 +164,7 @@ class AnnouncementsController < ApplicationController
else
cats = ["all"] + cats
end
anns = anns.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] }
anns = anns.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] }
end
cats = cats.uniq
tags = tags.uniq
@ -502,13 +502,13 @@ class AnnouncementsController < ApplicationController
if devide_flag
feeds_anns = get_feed_announcements("widget")
top_anns = top_anns + feeds_anns.select{|v| v['is_top']}
top_anns = top_anns.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] }
top_anns = top_anns.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] }
rest_count = widget_data_count - top_anns.count
if rest_count <= 0
anns = top_anns.take(widget_data_count)
else
rest_all_anns = feeds_anns.select{|v| v['is_top'] != true} + not_top_anns.take(rest_count)
rest_anns = rest_all_anns.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] }.take(rest_count)
rest_anns = rest_all_anns.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] }.take(rest_count)
anns = top_anns + rest_anns
end
end

6
app/helpers/announcements_helper.rb
View File

@ -243,10 +243,10 @@ module AnnouncementsHelper
if announcements.count != 0
top_anns = announcements.select{|v| v.is_top} + feeds_anns.select{|v| v['is_top']}
rest_all_anns = feeds_anns.select{|v| v['is_top'] != true} + announcements.select{|v| !v.is_top}
rest_anns = rest_all_anns.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] }
all_sorted = top_anns.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] } + rest_anns
rest_anns = rest_all_anns.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] }
all_sorted = top_anns.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] } + rest_anns
else
all_sorted = feeds_anns.select{|v| v['is_top']}.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] } + feeds_anns.select{|v| v['is_top'] != true}.sort_by { |a| [a["postdate"].blank? ? 1 : 0, a["postdate"].to_time] }
all_sorted = feeds_anns.select{|v| v['is_top']}.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] } + feeds_anns.select{|v| v['is_top'] != true}.sort_by { |a| tmp=a["postdate"].blank?;[tmp ? 1 : 0, tmp ? nil : a["postdate"].to_time] }
end
all_filter = filter_by_keywords(all_sorted,params[:keywords],params[:stime],params[:etime])
else