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

fix error

This commit is contained in:
邱博亞 2023-04-08 23:39:54 +08:00
parent 142300523c
commit 28b9abfd24
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/bulletin_feed.rb
View File

@ -74,7 +74,6 @@ class BulletinFeed
if tmp_enable_annc_dept if tmp_enable_annc_dept
annc_depts = annc_depts_translations[I18n.default_locale.to_s] rescue [] annc_depts = annc_depts_translations[I18n.default_locale.to_s] rescue []
end end
if !bf.nil?
tags = bf.tag_ids tags = bf.tag_ids
categories = bf.category_ids categories = bf.category_ids
if !(categories.empty? && tags.empty?) if !(categories.empty? && tags.empty?)
@ -109,9 +108,8 @@ class BulletinFeed
announcements = anns_before_filter.to_a announcements = anns_before_filter.to_a
end end
else else
anns_before_filter = Bulletin.is_approved_and_show anns_before_filter = Bulletin.can_display_and_sorted
announcements = [] announcements = anns_before_filter.to_a
end
end end
all_anns = [] all_anns = []
tag_ids = [] tag_ids = []