merge new feature #15

Merged
chiu merged 6 commits from 123/seminar:master into master 2023-09-27 16:22:22 +00:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit 228fcd8781 - Show all commits

View File

@ -47,7 +47,8 @@ class SeminarSignupField
end
def locale
get_data["cross_lang"] == "true" ? false : true
tmp = get_data
!tmp || get_data["cross_lang"] == "true" ? false : true
end
def self_defined_markup_options?

View File

@ -19,7 +19,7 @@
<div class="highlight seminar_privacy">
<%= @seminar_agreement.content.html_safe %>
<%= @seminar_agreement.content.html_safe rescue '' %>
</div>