Compare commits
No commits in common. "b2221cf2bd92a4a3d7465b5699a06775f894d95f" and "3ba5d512cffcffe56936eddac162ef715eb761ad" have entirely different histories.
b2221cf2bd
...
3ba5d512cf
|
@ -468,14 +468,14 @@ class Admin::ApplicationFormsController < OrbitAdminController
|
||||||
application_form_main_params['application_form_links_attributes'].delete(idx.to_s) if link['url'].blank?
|
application_form_main_params['application_form_links_attributes'].delete(idx.to_s) if link['url'].blank?
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
application_form_signup_set_params = application_form_main_params['application_form_signup_field_sets_attributes']
|
application_form_signup_set_params = application_form_main_params['application_form_signup_field_sets']
|
||||||
application_form_email_sets_params = application_form_main_params['application_form_email_sets_attributes']
|
application_form_email_sets_params = application_form_main_params['application_form_email_sets']
|
||||||
application_form_signup_field_customs_params = application_form_main_params["application_form_signup_field_customs_attributes"].to_h rescue {}
|
application_form_signup_field_customs_params = application_form_main_params["application_form_signup_field_customs"].to_h rescue {}
|
||||||
application_form_main_params["application_form_signup_field_customs_attributes"].to_h.each do |k,v|
|
application_form_main_params["application_form_signup_field_customs"].to_h.each do |k,v|
|
||||||
v.delete "title"
|
v.delete "title"
|
||||||
end
|
end
|
||||||
application_form_main_params.delete(:application_form_signup_field_sets_attributes)
|
application_form_main_params.delete(:application_form_signup_field_sets)
|
||||||
application_form_main_params.delete(:application_form_email_sets_attributes)
|
application_form_main_params.delete(:application_form_email_sets)
|
||||||
application_form = ApplicationFormMain.new(application_form_main_params)
|
application_form = ApplicationFormMain.new(application_form_main_params)
|
||||||
application_form.create_user_id = current_user.id
|
application_form.create_user_id = current_user.id
|
||||||
application_form.update_user_id = current_user.id
|
application_form.update_user_id = current_user.id
|
||||||
|
@ -541,8 +541,8 @@ class Admin::ApplicationFormsController < OrbitAdminController
|
||||||
if @application_form_params.has_key?("title_translations")
|
if @application_form_params.has_key?("title_translations")
|
||||||
@application_form_params["organizer_id"] = nil if @application_form_params["organizer_id"].nil?
|
@application_form_params["organizer_id"] = nil if @application_form_params["organizer_id"].nil?
|
||||||
end
|
end
|
||||||
if @application_form_params[:application_form_signup_fields_attributes]
|
if @application_form_params[:application_form_signup_fields]
|
||||||
@application_form_params[:application_form_signup_fields_attributes].each do |a|
|
@application_form_params[:application_form_signup_fields].each do |a|
|
||||||
@field_name = 'application_form_main'
|
@field_name = 'application_form_main'
|
||||||
field_status = a.last[:id].present?
|
field_status = a.last[:id].present?
|
||||||
@attribute_field = ApplicationFormSignupField.add_application_form_signup_field(@application_form, a.last, a.last[:id], field_status)
|
@attribute_field = ApplicationFormSignupField.add_application_form_signup_field(@application_form, a.last, a.last[:id], field_status)
|
||||||
|
@ -552,8 +552,8 @@ class Admin::ApplicationFormsController < OrbitAdminController
|
||||||
@application_form.application_form_signup_fields.each{|t| t.destroy if t["to_delete"] == true}
|
@application_form.application_form_signup_fields.each{|t| t.destroy if t["to_delete"] == true}
|
||||||
|
|
||||||
redirect_to admin_application_forms_path and return
|
redirect_to admin_application_forms_path and return
|
||||||
elsif @application_form_params[:application_form_submission_fields_attributes]
|
elsif @application_form_params[:application_form_submission_fields]
|
||||||
params[:application_form_main][:application_form_submission_fields_attributes].each do |a|
|
params[:application_form_main][:application_form_submission_fields].each do |a|
|
||||||
@field_name = 'application_form_main'
|
@field_name = 'application_form_main'
|
||||||
field_status = a.last[:id].present?
|
field_status = a.last[:id].present?
|
||||||
@attribute_field = ApplicationFormSubmissionField.add_application_form_signup_field(@application_form, a.last, a.last[:id], field_status)
|
@attribute_field = ApplicationFormSubmissionField.add_application_form_signup_field(@application_form, a.last, a.last[:id], field_status)
|
||||||
|
|
|
@ -30,9 +30,9 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_address
|
def render_address
|
||||||
control_group_wrapper_for_af do |key,value|
|
control_group_wrapper do |key,value|
|
||||||
value = (can_muti_lang_input_for_af? ? @prefiled_value[key] : @prefiled_value) rescue nil
|
value = (can_muti_lang_input? ? @prefiled_value[key] : @prefiled_value) rescue nil
|
||||||
key_field = can_muti_lang_input_for_af? ? "[#{key}]" : ""
|
key_field = can_muti_lang_input? ? "[#{key}]" : ""
|
||||||
place_holder= @panel_setting["placeholder"][key] rescue ''
|
place_holder= @panel_setting["placeholder"][key] rescue ''
|
||||||
# result = text_area_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
# result = text_area_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
||||||
result = text_field_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
result = text_field_tag(get_field_name_base + key_field, value,@markup_options.merge({:placeholder=>place_holder,:for=>key}))
|
||||||
|
@ -50,7 +50,7 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
|
|
||||||
def render_checkbox
|
def render_checkbox
|
||||||
@prefiled_value ||=[]
|
@prefiled_value ||=[]
|
||||||
control_group_wrapper_for_af do
|
control_group_wrapper do
|
||||||
a = self.typeE[:option_list].collect do |key,value|
|
a = self.typeE[:option_list].collect do |key,value|
|
||||||
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), { :id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value[I18n.locale.to_s],@markup_options.merge(:class=>"checkbox inline"))
|
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",check_box_tag(get_field_name_base+"[#{key}]", true , (@prefiled_value.include?(key) ? true : false), { :id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value[I18n.locale.to_s],@markup_options.merge(:class=>"checkbox inline"))
|
||||||
end.join.html_safe rescue ""
|
end.join.html_safe rescue ""
|
||||||
|
@ -63,7 +63,7 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
if date_is_range?
|
if date_is_range?
|
||||||
# fill_from = @attribute_value.get_date(:from) rescue nil
|
# fill_from = @attribute_value.get_date(:from) rescue nil
|
||||||
# fill_to = @attribute_value.get_date(:to) rescue nil
|
# fill_to = @attribute_value.get_date(:to) rescue nil
|
||||||
control_group_wrapper_for_af do
|
control_group_wrapper do
|
||||||
|
|
||||||
case self.typeC['format']
|
case self.typeC['format']
|
||||||
when 'format1'
|
when 'format1'
|
||||||
|
@ -112,8 +112,8 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy')
|
tmp = datetime_picker(get_field_name_base, (@prefiled_value ? @prefiled_value : d.strftime("%Y")), 'yyyy')
|
||||||
end
|
end
|
||||||
|
|
||||||
control_group_wrapper_for_af{tmp}
|
control_group_wrapper{tmp}
|
||||||
# control_group_wrapper_for_af{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
|
# control_group_wrapper{date_select(get_field_name_base,nil,@markup_options.merge(:default=>@prefiled_value),:class=>"input-small")}
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -136,7 +136,7 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
|
|
||||||
def render_radio_button
|
def render_radio_button
|
||||||
@prefiled_value ||=[]
|
@prefiled_value ||=[]
|
||||||
control_group_wrapper_for_af do
|
control_group_wrapper do
|
||||||
self.typeE[:option_list].collect do |key,value|
|
self.typeE[:option_list].collect do |key,value|
|
||||||
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {:required=>@require,:id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value[I18n.locale.to_s],@markup_options.merge(:class=>"radio inline"))
|
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",radio_button_tag(get_field_name_base, key , (@prefiled_value.include?(key) ? true : false), {:required=>@require,:id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value[I18n.locale.to_s],@markup_options.merge(:class=>"radio inline"))
|
||||||
end.join.html_safe
|
end.join.html_safe
|
||||||
|
@ -145,7 +145,7 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
def render_application_form_preferred_session
|
def render_application_form_preferred_session
|
||||||
@prefiled_value ||=[]
|
@prefiled_value ||=[]
|
||||||
@prefiled_value = Array(@prefiled_value)
|
@prefiled_value = Array(@prefiled_value)
|
||||||
control_group_wrapper_for_af do
|
control_group_wrapper do
|
||||||
@member.summary_chioices.map.with_index do |value,key|
|
@member.summary_chioices.map.with_index do |value,key|
|
||||||
key = key.to_s
|
key = key.to_s
|
||||||
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",radio_button_tag(get_field_name_base, key , ((@prefiled_value.include?(key) || @prefiled_value.include?(key.to_i)) ? true : false), {:required=>@require,:id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value,@markup_options.merge(:class=>"radio inline"))
|
label_tag("#{get_basic_field_name_org}_#{self.id}_#{key}",radio_button_tag(get_field_name_base, key , ((@prefiled_value.include?(key) || @prefiled_value.include?(key.to_i)) ? true : false), {:required=>@require,:id=>"#{get_basic_field_name_org}_#{self.id}_#{key}"})+value,@markup_options.merge(:class=>"radio inline"))
|
||||||
|
@ -155,29 +155,29 @@ module Admin::ApplicationFormsFieldHelper
|
||||||
def render_select
|
def render_select
|
||||||
prompt = @panel_setting["initial"][I18n.locale.to_s] rescue nil
|
prompt = @panel_setting["initial"][I18n.locale.to_s] rescue nil
|
||||||
@markup_options.merge!(:prompt => prompt) unless prompt.nil?
|
@markup_options.merge!(:prompt => prompt) unless prompt.nil?
|
||||||
control_group_wrapper_for_af{select_tag( get_field_name_base,options_for_select(self.typeB["option_list"].collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
|
control_group_wrapper{select_tag( get_field_name_base,options_for_select(self.typeB["option_list"].collect{|p| [p[1][I18n.locale.to_s],p[0]]},@prefiled_value),@markup_options)} rescue ""
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_text_area
|
def render_text_area
|
||||||
control_group_wrapper_for_af do |key,value|
|
control_group_wrapper do |key,value|
|
||||||
if !@prefiled_value.nil?
|
if !@prefiled_value.nil?
|
||||||
value = can_muti_lang_input_for_af? ? @prefiled_value[key] : @prefiled_value
|
value = can_muti_lang_input? ? @prefiled_value[key] : @prefiled_value
|
||||||
else
|
else
|
||||||
value = nil
|
value = nil
|
||||||
end
|
end
|
||||||
key = can_muti_lang_input_for_af? ? "#{key}" : I18n.locale
|
key = can_muti_lang_input? ? "#{key}" : I18n.locale
|
||||||
place_holder= typeD["placeholder"][key] rescue ''
|
place_holder= typeD["placeholder"][key] rescue ''
|
||||||
name1 = can_muti_lang_input_for_af? ? (get_field_name_base + "[#{key}]") : get_field_name_base
|
name1 = can_muti_lang_input? ? (get_field_name_base + "[#{key}]") : get_field_name_base
|
||||||
text_area_tag(name1, value,@markup_options.merge(:placeholder=>place_holder,:class=>'ckeditor input-medium form-control'))
|
text_area_tag(name1, value,@markup_options.merge(:placeholder=>place_holder,:class=>'ckeditor input-medium form-control'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_text_field
|
def render_text_field
|
||||||
a = control_group_wrapper_for_af do |key,value|
|
a = control_group_wrapper do |key,value|
|
||||||
add_more_blank = can_add_more ? "[]" : ""
|
add_more_blank = can_add_more ? "[]" : ""
|
||||||
key_field = can_muti_lang_input_for_af? ? "#{key}" : I18n.locale
|
key_field = can_muti_lang_input? ? "#{key}" : I18n.locale
|
||||||
place_holder= typeA["placeholder"][key_field] rescue ''
|
place_holder= typeA["placeholder"][key_field] rescue ''
|
||||||
name1 = can_muti_lang_input_for_af? ? ([get_field_name_base,add_more_blank,"[#{key_field}]"].join) : ([get_field_name_base,add_more_blank].join)
|
name1 = can_muti_lang_input? ? ([get_field_name_base,add_more_blank,"[#{key_field}]"].join) : ([get_field_name_base,add_more_blank].join)
|
||||||
text_field_tag(name1, value,@markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control'))
|
text_field_tag(name1, value,@markup_options.merge(:placeholder=>place_holder,:class=>'input-medium form-control'))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -210,7 +210,7 @@ protected
|
||||||
end
|
end
|
||||||
# div_class_ary = ["tab-pane" ,"fade","#{get_pairing_tab_class({})}_#{key}"]
|
# div_class_ary = ["tab-pane" ,"fade","#{get_pairing_tab_class({})}_#{key}"]
|
||||||
div_class_ary = ["tab-pane" ,"fade"]
|
div_class_ary = ["tab-pane" ,"fade"]
|
||||||
if @show_set_field_for_af && @markup=='text_area'
|
if @show_set_field && @markup=='text_area'
|
||||||
div_id = "ckeditor_#{get_pairing_tab_class({})}_#{key}"
|
div_id = "ckeditor_#{get_pairing_tab_class({})}_#{key}"
|
||||||
else
|
else
|
||||||
div_id = "#{get_pairing_tab_class({})}_#{key}"
|
div_id = "#{get_pairing_tab_class({})}_#{key}"
|
||||||
|
@ -229,7 +229,7 @@ protected
|
||||||
tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
|
tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do
|
||||||
buff2 = valid_locales.each.collect do |key|
|
buff2 = valid_locales.each.collect do |key|
|
||||||
# link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
|
# link_entry = self.add_more ? "#{add_more_tab(:tab_btn,loop_counter,key)}" : "#tab"+id.to_s+"_#{key}"
|
||||||
if @show_set_field_for_af && @markup=='text_area'
|
if @show_set_field && @markup=='text_area'
|
||||||
link_entry_ary = ["#ckeditor_#{get_pairing_tab_class({})}","_#{key}"]
|
link_entry_ary = ["#ckeditor_#{get_pairing_tab_class({})}","_#{key}"]
|
||||||
else
|
else
|
||||||
link_entry_ary = ["##{get_pairing_tab_class({})}","_#{key}"]
|
link_entry_ary = ["##{get_pairing_tab_class({})}","_#{key}"]
|
||||||
|
@ -301,7 +301,7 @@ protected
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def controls_wrapper_for_af(*add_more_params,&block)
|
def controls_wrapper(*add_more_params,&block)
|
||||||
result = Array.new
|
result = Array.new
|
||||||
add_more_counter = ""
|
add_more_counter = ""
|
||||||
|
|
||||||
|
@ -312,7 +312,7 @@ protected
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if can_muti_lang_input_for_af?
|
if can_muti_lang_input?
|
||||||
result << lang_panel_tabbable_wrapper(add_more_params,&block)
|
result << lang_panel_tabbable_wrapper(add_more_params,&block)
|
||||||
result << gen_modal_dialog if self.markup == "address"
|
result << gen_modal_dialog if self.markup == "address"
|
||||||
# result << add_more_unt if can_add_more
|
# result << add_more_unt if can_add_more
|
||||||
|
@ -335,11 +335,11 @@ protected
|
||||||
result[0]
|
result[0]
|
||||||
end
|
end
|
||||||
|
|
||||||
end # of def controls_wrapper_for_af(&block)
|
end # of def controls_wrapper(&block)
|
||||||
|
|
||||||
def control_group_wrapper_for_af(&block)
|
def control_group_wrapper(&block)
|
||||||
div_class = can_muti_lang_input_for_af? ? "col-sm-10 controls" : "col-sm-10 controls"
|
div_class = can_muti_lang_input? ? "col-sm-10 controls" : "col-sm-10 controls"
|
||||||
# div_class = can_muti_lang_input_for_af? ? "control-group language-swich" : "control-group"
|
# div_class = can_muti_lang_input? ? "control-group language-swich" : "control-group"
|
||||||
result = ""
|
result = ""
|
||||||
|
|
||||||
case self.markup
|
case self.markup
|
||||||
|
@ -351,7 +351,7 @@ protected
|
||||||
multipleInputs =
|
multipleInputs =
|
||||||
content_tag(:div,:class=>"add-target") do
|
content_tag(:div,:class=>"add-target") do
|
||||||
@attribute_value.add_more_counter.times.collect do |t|
|
@attribute_value.add_more_counter.times.collect do |t|
|
||||||
controls_wrapper_for_af(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
|
controls_wrapper(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
|
||||||
end.join('').html_safe # of add_more fields
|
end.join('').html_safe # of add_more fields
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -363,20 +363,20 @@ protected
|
||||||
# result = label + multipleInputs + add_more_unt
|
# result = label + multipleInputs + add_more_unt
|
||||||
# result = label + 一堆的輸入框(要用 multipleInput editMore 包起來) + add_more btn + hidden_fields
|
# result = label + 一堆的輸入框(要用 multipleInput editMore 包起來) + add_more btn + hidden_fields
|
||||||
else
|
else
|
||||||
result = form_label + content_tag(:div,controls_wrapper_for_af(&block),:class=>div_class)
|
result = form_label + content_tag(:div,controls_wrapper(&block),:class=>div_class)
|
||||||
end
|
end
|
||||||
|
|
||||||
when "address"
|
when "address"
|
||||||
|
|
||||||
# address = content_tag :div,:class=>"multipleInput editMore" do
|
# address = content_tag :div,:class=>"multipleInput editMore" do
|
||||||
address = content_tag :div,:class=>"col-sm-10" do
|
address = content_tag :div,:class=>"col-sm-10" do
|
||||||
form_label + content_tag(:div, controls_wrapper_for_af(&block), :class=>'add-input')
|
form_label + content_tag(:div, controls_wrapper(&block), :class=>'add-input')
|
||||||
end # of div multipleInput editMore
|
end # of div multipleInput editMore
|
||||||
|
|
||||||
result = address
|
result = address
|
||||||
|
|
||||||
else
|
else
|
||||||
result = form_label + content_tag(:div,controls_wrapper_for_af(&block),:class=>div_class)
|
result = form_label + content_tag(:div,controls_wrapper(&block),:class=>div_class)
|
||||||
end
|
end
|
||||||
result = result + end_block
|
result = result + end_block
|
||||||
result.html_safe
|
result.html_safe
|
||||||
|
@ -387,7 +387,7 @@ protected
|
||||||
def add_more_unt
|
def add_more_unt
|
||||||
temp_field_name = get_basic_field_name_base + '[temp]'
|
temp_field_name = get_basic_field_name_base + '[temp]'
|
||||||
add_more = content_tag :p,:class=> 'add-btn' do
|
add_more = content_tag :p,:class=> 'add-btn' do
|
||||||
content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus"),"#","data-roles"=>"role_a",:class=>"trigger #{can_muti_lang_input_for_af? ? 'textLengInput' : 'textInput' } btn btn-small btn-primary"
|
content = link_to (content_tag :i,I18n.t(:add),:class=>"icon-plus"),"#","data-roles"=>"role_a",:class=>"trigger #{can_muti_lang_input? ? 'textLengInput' : 'textInput' } btn btn-small btn-primary"
|
||||||
content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count", :id=>nil)
|
content << hidden_field_tag("#{temp_field_name}[count]",@attribute_value.add_more_counter ,:class=>"list_count", :id=>nil)
|
||||||
content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name", :id=>nil)
|
content << hidden_field_tag("#{temp_field_name}[count]",get_basic_field_name_base,:class=>"field_name", :id=>nil)
|
||||||
content
|
content
|
||||||
|
@ -458,7 +458,7 @@ protected
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def can_muti_lang_input_for_af?
|
def can_muti_lang_input?
|
||||||
if self.markup == "address"
|
if self.markup == "address"
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
|
@ -483,9 +483,9 @@ protected
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
def show_set_field_for_af(field_sets,key_field,key_index,field,markup='text_field')
|
def show_set_field(field_sets,key_field,key_index,field,markup='text_field')
|
||||||
@show_set_field_for_af = true
|
@show_set_field = true
|
||||||
def self.can_muti_lang_input_for_af?
|
def self.can_muti_lang_input?
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
def self.can_add_more
|
def self.can_add_more
|
||||||
|
@ -524,7 +524,7 @@ protected
|
||||||
end
|
end
|
||||||
@attribute_value = field_sets
|
@attribute_value = field_sets
|
||||||
@prefiled_value = field_sets[field]
|
@prefiled_value = field_sets[field]
|
||||||
a = control_group_wrapper_for_af do |key,value|
|
a = control_group_wrapper do |key,value|
|
||||||
add_more_blank = ""
|
add_more_blank = ""
|
||||||
if markup=='text_field'
|
if markup=='text_field'
|
||||||
if key_field == 'application_form_email_sets'
|
if key_field == 'application_form_email_sets'
|
||||||
|
@ -540,7 +540,7 @@ protected
|
||||||
@key_field = nil
|
@key_field = nil
|
||||||
@key_index = nil
|
@key_index = nil
|
||||||
@field = nil
|
@field = nil
|
||||||
@show_set_field_for_af = nil
|
@show_set_field = nil
|
||||||
return a.html_safe
|
return a.html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -117,15 +117,15 @@
|
||||||
<%= t("application_form_signup.#{attr_signup.field_name}") %>
|
<%= t("application_form_signup.#{attr_signup.field_name}") %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<%= show_set_field_for_af(attr_signup,'application_form_signup_field_sets_attributes',signup_index,'name') %>
|
<%= show_set_field(attr_signup,'application_form_signup_field_sets',signup_index,'name') %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<%= show_set_field_for_af(attr_signup,'application_form_signup_field_sets_attributes',signup_index,'placeholder') %>
|
<%= show_set_field(attr_signup,'application_form_signup_field_sets',signup_index,'placeholder') %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<input type="hidden" class="field_name" name='<%= "application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][field_name]" %>' value="<%= attr_signup.field_name %>">
|
<input type="hidden" class="field_name" name='<%= "application_form_main[application_form_signup_field_sets][#{signup_index}][field_name]" %>' value="<%= attr_signup.field_name %>">
|
||||||
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][disabled]" %>' value="false">
|
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets][#{signup_index}][disabled]" %>' value="false">
|
||||||
<%= check_box_tag("application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][disabled]", true ,attr_signup.disabled) %>
|
<%= check_box_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][disabled]", true ,attr_signup.disabled) %>
|
||||||
</td>
|
</td>
|
||||||
<td style="padding-left: 1em;">
|
<td style="padding-left: 1em;">
|
||||||
<% if attr_signup.field_name == 'email' %>
|
<% if attr_signup.field_name == 'email' %>
|
||||||
|
@ -144,9 +144,9 @@
|
||||||
</script>
|
</script>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if false #attr_signup.field_name != 'recaptcha' %>
|
<% if false #attr_signup.field_name != 'recaptcha' %>
|
||||||
<!-- <input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][hidden]" %>' value="false"> -->
|
<!-- <input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]" %>' value="false"> -->
|
||||||
<%= hidden_field_tag("application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][hidden]",attr_signup.hidden) %>
|
<%= hidden_field_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]",attr_signup.hidden) %>
|
||||||
<%#= check_box_tag("application_form_main[application_form_signup_field_sets_attributes][#{signup_index}][hidden]", true ,attr_signup.hidden) %>
|
<%#= check_box_tag("application_form_main[application_form_signup_field_sets][#{signup_index}][hidden]", true ,attr_signup.hidden) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
@ -169,13 +169,13 @@
|
||||||
<%= ApplicationFormSignupField.where(id:attr_custom.application_form_signup_field_id).first.title rescue '' %>
|
<%= ApplicationFormSignupField.where(id:attr_custom.application_form_signup_field_id).first.title rescue '' %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_customs_attributes][#{custom_index}][hidden]" %>' value="false">
|
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_signup_field_customs][#{custom_index}][hidden]" %>' value="false">
|
||||||
<%= check_box_tag("application_form_main[application_form_signup_field_customs_attributes][#{custom_index}][hidden]", true ,attr_custom.hidden) %>
|
<%= check_box_tag("application_form_main[application_form_signup_field_customs][#{custom_index}][hidden]", true ,attr_custom.hidden) %>
|
||||||
</td>
|
</td>
|
||||||
<% if !attr_custom.new_record? %>
|
<% if !attr_custom.new_record? %>
|
||||||
<input for="field_0" id="application_form_main_application_form_signup_field_customs_<%= custom_index.to_s %>_id" name="application_form_main[application_form_signup_field_customs_attributes][<%= custom_index.to_s %>][id]" type="hidden" value="<%= attr_custom.id.to_s %>">
|
<input for="field_0" id="application_form_main_application_form_signup_field_customs_<%= custom_index.to_s %>_id" name="application_form_main[application_form_signup_field_customs][<%= custom_index.to_s %>][id]" type="hidden" value="<%= attr_custom.id.to_s %>">
|
||||||
<% elsif f.object.copy_id.present? %>
|
<% elsif f.object.copy_id.present? %>
|
||||||
<input name="application_form_main[application_form_signup_field_customs_attributes][<%= custom_index.to_s %>][title]" type="hidden" value="<%= attr_custom.application_form_signup_field.title.to_s %>">
|
<input name="application_form_main[application_form_signup_field_customs][<%= custom_index.to_s %>][title]" type="hidden" value="<%= attr_custom.application_form_signup_field.title.to_s %>">
|
||||||
<% end %>
|
<% end %>
|
||||||
</tr>
|
</tr>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -217,8 +217,8 @@
|
||||||
<%= t('application_form.disable') %>
|
<%= t('application_form.disable') %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_email_sets_attributes][#{index1}][disabled]" %>' value="false">
|
<input type="hidden" class="field_set" name='<%= "application_form_main[application_form_email_sets][#{index1}][disabled]" %>' value="false">
|
||||||
<%= check_box_tag("application_form_main[application_form_email_sets_attributes][#{index1}][disabled]", true ,@email_set[index1].disabled) %>
|
<%= check_box_tag("application_form_main[application_form_email_sets][#{index1}][disabled]", true ,@email_set[index1].disabled) %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -226,7 +226,7 @@
|
||||||
<%= t('application_form.email_title') %>
|
<%= t('application_form.email_title') %>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<%= show_set_field_for_af(@email_set[index1],'application_form_email_sets_attributes',index1,'title','text_field') %>
|
<%= show_set_field(@email_set[index1],'application_form_email_sets',index1,'title','text_field') %>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -235,7 +235,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<%= show_set_field_for_af(@email_set[index1],'application_form_email_sets_attributes',index1,'content','text_area') %>
|
<%= show_set_field(@email_set[index1],'application_form_email_sets',index1,'content','text_area') %>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue