Merge branch 'master' into 'master'
Fix bug. See merge request spen/seminar!28
This commit is contained in:
commit
b6b12295df
|
@ -18,7 +18,7 @@ all_template.each do |folder|
|
||||||
if !folder.include?('mobile')
|
if !folder.include?('mobile')
|
||||||
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/.")}
|
||||||
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: "???")
|
||||||
|
|
Loading…
Reference in New Issue