From 31659c686041f5a5017de26f7322a13fe2f49d6b Mon Sep 17 00:00:00 2001 From: Bohung Date: Sat, 10 Apr 2021 10:47:33 +0800 Subject: [PATCH] Fix bug. --- app/controllers/admin/seminars_controller.rb | 7 +- .../_seminar_signup_render_table.html.erb | 2 +- .../seminar_signup_render_table.html.erb | 103 ------------------ 3 files changed, 6 insertions(+), 106 deletions(-) delete mode 100644 app/views/admin/seminars/seminar_signup_render_table.html.erb diff --git a/app/controllers/admin/seminars_controller.rb b/app/controllers/admin/seminars_controller.rb index 6c16491..f06b862 100644 --- a/app/controllers/admin/seminars_controller.rb +++ b/app/controllers/admin/seminars_controller.rb @@ -332,8 +332,8 @@ class Admin::SeminarsController < OrbitAdminController seminar_signup_set_params = seminar_main_params['seminar_signup_field_sets'] seminar_submission_set_params = seminar_main_params['seminar_submission_field_sets'] seminar_email_sets_params = seminar_main_params['seminar_email_sets'] - seminar_signup_field_customs_params = seminar_main_params["seminar_signup_field_customs"].to_hash - seminar_main_params["seminar_signup_field_customs"].each do |k,v| + seminar_signup_field_customs_params = seminar_main_params["seminar_signup_field_customs"].to_h rescue {} + seminar_main_params["seminar_signup_field_customs"].to_h.each do |k,v| v.delete "title" end seminar_main_params.delete(:seminar_signup_field_sets) @@ -533,6 +533,9 @@ class Admin::SeminarsController < OrbitAdminController end def set_seminar_signup_admin_setting page = params[:type] || params[:page] + if params[:action] == "seminar_signup" + page = params[:type] + end page = nil if page.blank? @seminar_signup_admin_setting = SeminarSignupAdminSetting.where(:seminar_main_id=>params[:id],:page=>page).first if @seminar_signup_admin_setting.nil? diff --git a/app/views/admin/seminars/_seminar_signup_render_table.html.erb b/app/views/admin/seminars/_seminar_signup_render_table.html.erb index e8f7001..cfc0758 100644 --- a/app/views/admin/seminars/_seminar_signup_render_table.html.erb +++ b/app/views/admin/seminars/_seminar_signup_render_table.html.erb @@ -118,7 +118,7 @@ ><%= val.to_s.html_safe %> <% end %> <% end %> - <% (0...count).each do |i|%> + <% (1...count+1).each do |i|%> <% indices.each do |index| %> diff --git a/app/views/admin/seminars/seminar_signup_render_table.html.erb b/app/views/admin/seminars/seminar_signup_render_table.html.erb deleted file mode 100644 index 79d184c..0000000 --- a/app/views/admin/seminars/seminar_signup_render_table.html.erb +++ /dev/null @@ -1,103 +0,0 @@ - - - - <% render :partial => "get_display_fields" %> - <% @field_name_translations.each_with_index do |trans,i|%> - <% next unless @display_field.include?(@field_names[i]) %> - - <% end %> - - - - <% @seminar_signups.each do |seminar_signup| %> - <% len = seminar_signup.seminar_signup_contributes.count %> - <% rowspan = "rowspan=#{len==0? 1 : len}" %> - <% vals = [] %> - - <% @field_names.each_with_index do |fn,i|%> - <% next unless @display_field.include?(fn) %> - <% names = fn.split(".") %> - <% val = "" %> - <% if names[0] == "seminar_signup_field_set" %> - <% if names[1] == "name" %> - <% val = seminar_signup.name - val += "
- -
" - %> - <% elsif names[1] == 'status' %> - <% val = t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> - <% elsif names[1] != 'recaptcha' %> - <% val = seminar_signup.send("#{names[1]}") %> - <% end %> - <% elsif names[0] == "default" %> - <% if names[2] == "name" %> - <% val = seminar_signup.name - val += "
- -
" - %> - <% elsif names[2] == "tel" %> - <% val = seminar_signup.tel %> - <% elsif names[2] == "registration_status" %> - <% val = t("seminar.registration_status_#{seminar_signup.status}") if !seminar_signup.status.blank? %> - <% end %> - <% elsif names[0] == "seminar_signup_field_custom" || names[0] == "seminar_signup_fields" %> - <% val = seminar_signup.seminar_signup_values.where(:key=>names[1]).first.get_value_by_locale(I18n.locale) rescue "" %> - <% elsif names[0] == "seminar_signup_contributes" %> - <% if names[1] == "file" %> - <% val = seminar_signup.seminar_signup_contributes.to_a %> - <% else %> - <% val = seminar_signup.seminar_signup_contributes.collect{|s| s.send(names[1])} %> - <% end %> - <% elsif names[0] == "seminar_submission_fields" %> - <% val = seminar_signup.seminar_signup_contributes.collect{|s| (s.seminar_submission_values.where(:key=>names[1]).first.get_value_by_locale(I18n.locale) rescue "")} %> - <% end %> - <% vals << val %> - <% end %> - <% count = 0 %> - <% indices = [] %> - <% vals.each_with_index do |val,i| %> - <% if val.class == Array %> - <% count = val.count - 1 %> - <% indices << i%> - - <% else %> - - <% end %> - <% end %> - <% (0...count).each do |i|%> - - <% indices.each do |index| %> - - <% end %> - - <% end %> - - <% end %> - -
<%= trans %>
- <% if val[0].class == SeminarSignupContribute #File %> - <% seminar_signup_contribute = val[0] %> - <%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => Nokogiri::HTML(seminar_signup_contribute.description).text} if seminar_signup_contribute.file.file %> - <% else %> - <%= val[0].html_safe.to_s rescue "" %> - <% end %> - ><%= val.to_s.html_safe %>
- <% if vals[index][i].class == SeminarSignupContribute #File %> - <% seminar_signup_contribute = vals[index][i] %> - <%= link_to (seminar_signup_contribute.title.blank? ? File.basename(seminar_signup_contribute.file.path) : seminar_signup_contribute.title) , seminar_signup_contribute.file.url, {:target => '_blank', :title => Nokogiri::HTML(seminar_signup_contribute.description).text} if seminar_signup_contribute.file.file %> - <% else %> - <%= vals[index][i].html_safe.to_s rescue "" %> - <% end %> -
\ No newline at end of file