harry
/
feeds
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
邱博亞 2021-10-21 10:55:01 +08:00
parent 09121746a2
commit 38ab0c654c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/admin/feeds_controller.rb
View File

@ -2,12 +2,12 @@ class Admin::FeedsController < OrbitAdminController
layout :compute_layout layout :compute_layout
helper_method :search_all_words helper_method :search_all_words
def compute_layout def compute_layout
if action_name== 'annc_content' if action_name== 'annc_content'
false false
else else
'back_end' 'back_end'
end end
end end
def index def index
@site_feeds = SiteFeed.all.group_by(&:remote_site_url) @site_feeds = SiteFeed.all.group_by(&:remote_site_url)
@school_urls = @site_feeds.keys @school_urls = @site_feeds.keys

2
app/models/site_feed_annc.rb
View File

@ -20,7 +20,7 @@ class SiteFeedAnnc
Array(self[:all_contents_for_feed]).collect do |v| Array(self[:all_contents_for_feed]).collect do |v|
tmp = v tmp = v
if hidden_annc.exclude?(v['id']) && !tmp["title_translations"][locale].blank? if hidden_annc.exclude?(v['id']) && !tmp["title_translations"][locale].blank?
if self.channel_key == "announcement" if self.channel_key == "announcement" && (tmp["postdate"].blank? || tmp["postdate"].to_time<=Time.now)
tmp['statuses'] = [] tmp['statuses'] = []
if self[:top_list].count == 0 || self[:top_list].exclude?(tmp['id']) if self[:top_list].count == 0 || self[:top_list].exclude?(tmp['id'])
tmp[:is_top] = false tmp[:is_top] = false