complete address field. still have javascript issue for fill back and display address ext fields in modal.
This commit is contained in:
1 parent
995bdbc86c
commit
3034e53423
7 files changed
+111
-66
No files matched your search
@@ -34,11 +34,14 @@ module AttributeFieldsHelper
|
||||
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 << hidden_field_tag(get_basic_field_name_base+"[temp][street_address][#{key}]",nil,:class=>"street_address_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[temp][city][#{key}]",nil,:class=>"city_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[temp][zip][#{key}]",nil,:class=>"zip_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[temp][country][#{key}]",nil,:class=>"country_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[temp][indicator][#{key}]",nil,:class=>"indicator_#{key}")
|
||||
add_ext= @attribute_value.address_ext[key] rescue {}
|
||||
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][county]",add_ext["county"],:class=>"county_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][street_address]",add_ext["street_address"],:class=>"street_address_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][city]",add_ext["city"],:class=>"city_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][zip]",add_ext["zip"],:class=>"zip_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][country]",add_ext["country"],:class=>"country_#{key}")
|
||||
result << hidden_field_tag(get_basic_field_name_base+"[address_ext][#{key}][indicator]",add_ext["indicator"],:class=>"indicator_#{key}")
|
||||
end
|
||||
end
|
||||
|
||||
@@ -124,7 +127,7 @@ protected
|
||||
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_ary = [".#{get_pairing_tab_class({})}",".#{key}"]
|
||||
link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
|
||||
# link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
|
||||
link_entry = link_entry_ary.join
|
||||
content_tag(:li,link_to(I18n.t("langs."+key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ? "active" : nil),:for=>key)
|
||||
end.join.html_safe # of VALID_LOCALES.collect for tabs
|
||||
@@ -170,9 +173,11 @@ protected
|
||||
case self.markup
|
||||
when "text_field"
|
||||
if can_add_more
|
||||
multipleInputs = content_tag :div,:class=>"multipleInput editMore" do
|
||||
multipleInput_ary = %w{multipleInput editMore}
|
||||
add_more_seri = "add_more_group_#{id}"
|
||||
multipleInputs = content_tag :div,:class=> multipleInput_ary.join(' ') ,:ext_class=>get_pairing_tab_class({}) do
|
||||
@attribute_value.add_more_counter.times.collect do |t|
|
||||
controls_wrapper(:value=>@prefiled_value[t],:counter=>t,&block)
|
||||
controls_wrapper(:value=>(@prefiled_value[t] rescue nil),:counter=>t,&block)
|
||||
end.join("\n").html_safe # of add_more fields
|
||||
end # of div multipleInput editMore
|
||||
result = label + multipleInputs + add_more_unt
|
||||
@@ -267,7 +272,13 @@ protected
|
||||
end
|
||||
|
||||
def gen_modal_dialog
|
||||
render_anywhere("shared/attribute_field/address_modal_dialog",{:field_name=>title,:html_id=>"#{get_pairing_tab_class({})}_m_window",:btn_class => "#{get_pairing_tab_class({})}"})
|
||||
render_anywhere("shared/attribute_field/address_modal_dialog",{
|
||||
:field_name=>title,
|
||||
:html_id=>"#{get_pairing_tab_class({})}_m_window",
|
||||
:btn_class => "#{get_pairing_tab_class({})}",
|
||||
:field_name_basic => get_basic_field_name_base
|
||||
}
|
||||
)
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user