chiu/Application_Form
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug.

Browse Source 
Add fields: version and confidentiality.
Update link expired translations.
Record agree reviewers.(Reviewer in every stage change to multiple.)
This commit is contained in:
bohung committed 2022-06-26 16:16:18 +08:00
1 parent 350127fdf1
commit 92cf65bfaa
8 files changed
+67 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/application_forms_controller.rb
+12 -3
View File
@@ -407,6 +407,8 @@ class ApplicationFormsController < ApplicationController
extra_text += render_to_string("application_forms/signup_email_contents",:locals=>{:application_form=>application_form,
:application_form_signup=>signup},:layout=>false)
if params[:type] == 'agree'
signup.agree_reviewer_ids[stage_num.to_s] = params[:reviewer]
signup.save
if stage_num == application_form.get_max_stage
signup.update(:review_status => 2)
signup.clean_cipher
@@ -427,7 +429,10 @@ class ApplicationFormsController < ApplicationController
host_url = request.protocol + request.host_with_port
end
agree_link = host_url + Rails.application.routes.url_helpers.xhr_application_forms_agree_link_path(:locale=>I18n.locale, :id=>signup.id.to_s, :cipher=>signup.get_cipher_stage(signup.process_stage))
send_mail('submission', signup.get_reviewer_email, form_params_main_id,extra_text, {'agree_link'=>agree_link})
id_with_email = signup.get_reviewer_email
id_with_email.each do |id, email|
send_mail('submission', email, form_params_main_id,extra_text, {'agree_link'=>agree_link + "&reviewer=#{id}"})
end
end
else
mail_to = [signup.email]
@@ -449,6 +454,7 @@ class ApplicationFormsController < ApplicationController
@application_form = ApplicationFormMain.where(id: form_params_main_id).first
@application_form_signup = ApplicationFormSignup.new(application_form_signup_params)
@application_form_signup.application_form_main = @application_form
if @application_form.application_form_signup_field_sets.count!=0
flag = @application_form.application_form_signup_field_sets.select{|v| v.field_name=='recaptcha'}[0].disabled
else
@@ -492,7 +498,10 @@ class ApplicationFormsController < ApplicationController
host_url = request.referer.match(/http(s|):\/\/[^\/]+/)[0]
end
agree_link = host_url + Rails.application.routes.url_helpers.xhr_application_forms_agree_link_path(:locale=>I18n.locale, :id=>@application_form_signup.id.to_s, :cipher=>@application_form_signup.get_cipher_stage(1))
send_mail('submission', @application_form_signup.get_reviewer_email, form_params_main_id,extra_text, {'agree_link'=>agree_link})
id_with_email = @application_form_signup.get_reviewer_email
id_with_email.each do |id, email|
send_mail('submission', email , form_params_main_id,extra_text, {'agree_link'=>agree_link + "&reviewer=#{id}"})
end
redirect_to "#{params[:referer_url]}/?method=signup_ok&serial_number=#{@application_form_signup.display_serial_number}"
else
if !@signup.blank?
@@ -756,7 +765,7 @@ class ApplicationFormsController < ApplicationController
def application_form_signup_params
tmp = params.require(:application_form_signup).permit!
tmp['reviewer_ids_list'] = (0...@application_form.reviewer_enables.length).map{|k| Array((tmp['reviewer_ids_list'][k.to_s] rescue []))}
tmp['reviewer_ids_list'] = (0..@application_form.reviewer_enables.rindex(true)).map{|k| Array((tmp['reviewer_ids_list'][k.to_s] rescue []))}
tmp
end