fix feed error

This commit is contained in:
chiu committed 2021-08-13 12:42:14 +08:00
1 parent c5f95c9968
commit 234ed6cfea
10 files changed
+232 -172

No files matched your search

@@ -159,7 +159,7 @@ class Admin::AnnouncementsController < OrbitAdminController
def feedform
if params[:type] == "new"
@announcement_feed = BulletinFeed.new
@announcement_feed = BulletinFeed.new(id: nil)
render :partial => "feed_form"
else params[:type] == "edit"
@announcement_feed = BulletinFeed.find(params[:id])
@@ -170,7 +170,7 @@ class Admin::AnnouncementsController < OrbitAdminController
def createfeed
announcement_feed = BulletinFeed.new(feed_params)
announcement_feed.save
create_feed_cache(nil,announcement_feed)
#BulletinFeed.create_feed_cache(nil,announcement_feed)
feeds = BulletinFeed.all.asc(:created_at)
render :partial => "feed", :collection => feeds
end
@@ -179,7 +179,7 @@ class Admin::AnnouncementsController < OrbitAdminController
ann_feed = BulletinFeed.find(params[:id])
ann_feed.update_attributes(feed_params)
ann_feed.save
create_feed_cache(nil,ann_feed)
#BulletinFeed.create_feed_cache(nil,ann_feed)
feeds = BulletinFeed.all.asc(:created_at)
render :partial => "feed", :collection => feeds
end
@@ -243,7 +243,7 @@ class Admin::AnnouncementsController < OrbitAdminController
bulletin.save
build_email(bulletin,I18n.locale)
create_feed_cache(bulletin)
#BulletinFeed.create_feed_cache(bulletin)
redirect_to admin_announcements_path
end
@@ -261,7 +261,7 @@ class Admin::AnnouncementsController < OrbitAdminController
send_rejection_email(bulletin,I18n.locale)
end
bulletin.save
create_feed_cache(bulletin)
#BulletinFeed.create_feed_cache(bulletin)
redirect_to admin_announcements_path
end
@@ -320,7 +320,7 @@ class Admin::AnnouncementsController < OrbitAdminController
bulletin.save
end
build_email(bulletin,I18n.locale)
create_feed_cache(bulletin)
#BulletinFeed.create_feed_cache(bulletin)
now_bulletin_page = Bulletin.where(:title.ne => "",:is_preview.in=>[false,nil])
.order_by(sort).map(&:id).map.with_index.select{|v,i| v==bulletin.id}[0][1] rescue nil
now_bulletin_page = now_bulletin_page.nil? ? 0 : ((now_bulletin_page+1).to_f/10).ceil
@@ -403,7 +403,7 @@ class Admin::AnnouncementsController < OrbitAdminController
bulletin.is_preview = true
bulletin.save
create_feed_cache(bulletin)
#BulletinFeed.create_feed_cache(bulletin)
render :text=>page_for_bulletin(bulletin) + "?preview=true"
end
@@ -508,27 +508,4 @@ class Admin::AnnouncementsController < OrbitAdminController
end
bps
end
def create_feed_cache(bulletin=nil,bulletin_feed=nil)
if !bulletin.nil?
BulletinFeed.where(:tag_ids.in => Array(bulletin.tag_ids).collect{|v| v.to_s}).each do |bulletin_feed|
uid = bulletin_feed.uid
uri = URI(request.protocol + request.host_with_port + "/xhr/announcements/feed/#{uid}.json")
Thread.new do
res_net = Net::HTTP.start(uri.host, uri.port,:use_ssl => uri.scheme == 'https',open_timeout: 60,read_timeout: 60) do |http|
req = Net::HTTP::Get.new(uri)
http.request(req)
end
end
end
elsif !bulletin_feed.nil?
uid = bulletin_feed.uid
uri = URI(request.protocol + request.host_with_port + "/xhr/announcements/feed/#{uid}.json")
Thread.new do
res_net = Net::HTTP.start(uri.host, uri.port,:use_ssl => uri.scheme == 'https',open_timeout: 60,read_timeout: 60) do |http|
req = Net::HTTP::Get.new(uri)
http.request(req)
end
end
end
end
end