Adjust logic

This commit is contained in:
rulingcom 2026-06-05 16:22:57 +08:00
parent 1025cb4438
commit f9ae568b8f
1 changed files with 10 additions and 6 deletions

View File

@ -359,12 +359,16 @@ class EventNews
def calculate_is_event_expired
setting = EventNewsSetting.first
if setting && setting.expired_event_to_bottom && event_end_date.present? && event_end_date >= Time.now
self.is_top = true
self.top_end_date = event_end_date
elsif setting && setting.expired_event_to_bottom && event_end_date.present? && event_end_date < Time.now
self.is_top = false
self.top_end_date = nil
if setting && setting.expired_event_to_bottom
if self.new_record?
self.is_top = true
self.top_end_date = event_end_date if event_end_date.present?
elsif event_end_date.present?
self.is_top = true
self.top_end_date = event_end_date
elsif event_end_date.blank? && self.top_end_date.present?
self.top_end_date = nil
end
end
end