diff options
author | ThibG <thib@sitedethib.com> | 2020-04-06 21:44:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-06 21:44:34 +0200 |
commit | c47be5bd864a1f5244f35122ba7fae31a149c73d (patch) | |
tree | c8e9e95a36ffb2346e3168d00364e4b614bee92a /app/models/announcement.rb | |
parent | 6e426267a762f3cd1efa2c5fb120a13543567775 (diff) | |
parent | 9101254d0a70bc6f899c093f33300cffceb7c8ac (diff) |
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/announcement.rb')
-rw-r--r-- | app/models/announcement.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/announcement.rb b/app/models/announcement.rb index f8ac4e09d..a4e427b49 100644 --- a/app/models/announcement.rb +++ b/app/models/announcement.rb @@ -14,6 +14,7 @@ # created_at :datetime not null # updated_at :datetime not null # published_at :datetime +# status_ids :bigint is an Array # class Announcement < ApplicationRecord @@ -49,7 +50,13 @@ class Announcement < ApplicationRecord end def statuses - @statuses ||= Status.from_text(text) + @statuses ||= begin + if status_ids.nil? + [] + else + Status.where(id: status_ids, visibility: [:public, :unlisted]) + end + end end def tags |