456
/
seminar2_old
forked from spen/seminar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

fix error



See merge request !5
This commit is contained in:
chiu 2020-05-05 22:04:05 +08:00
parent 04adaf9306 3456a79357
commit 3518ce2525
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/seminars_controller.rb
View File

@ -178,17 +178,21 @@ class SeminarsController < ApplicationController
update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values']) update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'])
flag = true flag = true
update_params.permit! update_params.permit!
if update_params['seminar_submission_values']['0']['value'].class==String if !update_params['seminar_submission_values'].nil?
value = update_params['seminar_submission_values']['0']['value'] if update_params['seminar_submission_values']['0']['value'].class==String
if !value.to_s.blank? value = update_params['seminar_submission_values']['0']['value']
flag = false if !value.to_s.blank?
end
else
update_params['seminar_submission_values']['0']['value'].each do |key,value|
if !value.to_s.blank?
flag = false flag = false
end end
else
update_params['seminar_submission_values']['0']['value'].each do |key,value|
if !value.to_s.blank?
flag = false
end
end
end end
else
flag = false
end end
if flag if flag
update_params['seminar_submission_values']['0']['value']['en'] = ' ' update_params['seminar_submission_values']['0']['value']['en'] = ' '

2
app/views/admin/seminars/export.xlsx.axlsx
View File

@ -2,7 +2,7 @@
wb = xlsx_package.workbook wb = xlsx_package.workbook
wb.add_worksheet(name: @seminar.title) do |sheet| wb.add_worksheet(name: (@seminar.title.to_s[0..27]+'...')) do |sheet|
row = [t('seminar_signup.signup_time')] row = [t('seminar_signup.signup_time')]

2
app/views/admin/seminars/seminar_signup.html.erb
View File

@ -80,7 +80,7 @@
</div> </div>
<% elsif field_set.field_name== 'status' %> <% elsif field_set.field_name== 'status' %>
<%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> <%= t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %>
<% else %> <% elsif field_set.field_name != 'recaptcha' %>
<%= seminar_signup.send("#{field_set.field_name}") %> <%= seminar_signup.send("#{field_set.field_name}") %>
<% end %> <% end %>
</td> </td>