spen
/
seminar
1
0
Fork 6
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge new feature #15

Merged
chiu merged 6 commits from 123/seminar:master into master 2023-09-27 16:22:22 +00:00
Conversation 0 Commits 6 Files Changed 7 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 228fcd8781 - Show all commits

3
app/models/seminar_signup_field.rb
View File

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

2
app/views/seminars/show_privacy.html.erb
View File

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