Merge branch 'master' into 'master'

Fix bug.

See merge request spen/seminar!27
This commit is contained in:
chiu 2021-11-18 11:10:55 +00:00
commit 6421a92bb6
1 changed files with 0 additions and 1 deletions

View File

@ -19,7 +19,6 @@ all_template.each do |folder|
info_json_file = "#{folder}modules/seminar/info.json" info_json_file = "#{folder}modules/seminar/info.json"
if File.exist?(info_json_file) if File.exist?(info_json_file)
Bundler.with_clean_env{system ('cp -f '+ app_path + '/modules/seminar/show.html.erb ' + "#{folder}modules/seminar/.")} Bundler.with_clean_env{system ('cp -f '+ app_path + '/modules/seminar/show.html.erb ' + "#{folder}modules/seminar/.")}
update_seminar_template(folder)
begin begin
file_text = File.read(info_json_file) rescue "" file_text = File.read(info_json_file) rescue ""
encode_file_text = file_text.encode("UTF-8", "UTF-8", invalid: :replace, replace: "???") encode_file_text = file_text.encode("UTF-8", "UTF-8", invalid: :replace, replace: "???")