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

Fix announcement iframe bug.

This commit is contained in:
BoHung Chiu 2020-08-03 17:11:20 +08:00
parent f531708a5f
commit ed06f3e891
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/announcements_controller.rb
View File

@ -371,6 +371,7 @@ class AnnouncementsController < ApplicationController
else else
@categories = params[:categories] @categories = params[:categories]
end end
OrbitHelper.set_site_locale(I18n.locale)
OrbitHelper.set_current_widget_module("announcement") OrbitHelper.set_current_widget_module("announcement")
OrbitHelper.set_params(params,current_user) OrbitHelper.set_params(params,current_user)
Bulletin.remove_expired_status Bulletin.remove_expired_status

4
app/helpers/announcements_helper.rb
View File

@ -426,9 +426,13 @@ module AnnouncementsHelper
dates = html.css("*[date-format]") dates = html.css("*[date-format]")
if !dates.blank? if !dates.blank?
dates.each do |d| dates.each do |d|
begin
format = d.attributes["date-format"].value format = d.attributes["date-format"].value
date = DateTime.parse(d.inner_text) date = DateTime.parse(d.inner_text)
d.inner_html = d.inner_html.gsub(d.inner_text.strip, " " + date.strftime(format)) d.inner_html = d.inner_html.gsub(d.inner_text.strip, " " + date.strftime(format))
rescue
next
end
end end
end end
html.css("body").to_html.html_safe html.css("body").to_html.html_safe