From dd05a8fc534a5c944e8f53d7137fe26718ee4750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Wed, 30 Mar 2022 15:41:51 +0800 Subject: [PATCH] fix error --- app/helpers/announcements_helper.rb | 1 - app/models/bulletin.rb | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/helpers/announcements_helper.rb b/app/helpers/announcements_helper.rb index d5140da..de51c39 100644 --- a/app/helpers/announcements_helper.rb +++ b/app/helpers/announcements_helper.rb @@ -195,7 +195,6 @@ module AnnouncementsHelper .can_display_and_sorted.is_approved .filter_by_categories(categories,false).filter_by_tags(tags).to_a end - print('announcements',announcements.collect(&:title)) if !(defined? SiteFeed).nil? if @type != "show_widget" feeds_anns = get_feed_announcements("index",nil,categories,page_number*page_data_count) diff --git a/app/models/bulletin.rb b/app/models/bulletin.rb index eb3328f..74f7339 100644 --- a/app/models/bulletin.rb +++ b/app/models/bulletin.rb @@ -106,6 +106,11 @@ class Bulletin scope :filter_cats_and_tags, ->(cats,tags) {filter_by_widget_categories(cats,false).filter_by_tags(tags)} before_create :set_expire before_save :check_limit + before_save do + if self.is_top_changed? && !self.is_top + self.sort_number = nil + end + end index({postdate: 1}, { unique: false, background: true }) index({is_top: -1,postdate: -1, _id: -1}, { unique: false, background: true }) index({approved: -1,is_hidden: 1,is_preview: 1, is_top: -1,postdate: -1,_id: -1,deadline: -1}, { unique: false, background: true })