gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20230103

Browse source
This commit is contained in:
KMY 2024-01-03 19:15:01 +09:00
commit 7356f776f2
60 changed files with 1349 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/announcement.rb
View file

@ -28,8 +28,8 @@ class Announcement < ApplicationRecord
has_many :announcement_reactions, dependent: :destroy
validates :text, presence: true
validates :starts_at, presence: true, if: -> { ends_at.present? }
validates :ends_at, presence: true, if: -> { starts_at.present? }
validates :starts_at, presence: true, if: :ends_at?
validates :ends_at, presence: true, if: :starts_at?
before_validation :set_published, on: :create
@ -46,7 +46,7 @@ class Announcement < ApplicationRecord
end
def time_range?
starts_at.present? && ends_at.present?
starts_at? && ends_at?
end
def mentions