diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb index 7e399bd..615be41 100644 --- a/app/controllers/asks_controller.rb +++ b/app/controllers/asks_controller.rb @@ -390,7 +390,8 @@ class AsksController < ApplicationController if v field_name = info['trans'] if field_name.present? - all_fields << {'field'=>field,'label'=>ask_label(field_name, v['required']),'content'=>show_on_front(k,v)} + id = "#{get_input_name_for_ask}[custom_values][#{k}]" + all_fields << {'field'=>field,'label'=>ask_label(id, field_name, v['required']),'content'=>show_on_front(k,v)} end end elsif field.start_with?("custom@") && is_cat_record @@ -400,7 +401,8 @@ class AsksController < ApplicationController if v field_name = info['trans'] if field_name.present? - all_fields << {'field'=>field,'label'=>ask_label(v['field'][I18n.locale],v['required']),'content'=>show_on_front(k,v)} + id = "#{get_input_name_for_ask}[custom_values][#{k}]" + all_fields << {'field'=>field,'label'=>ask_label(id, v['field'][I18n.locale],v['required']),'content'=>show_on_front(k,v)} end end end @@ -409,9 +411,10 @@ class AsksController < ApplicationController has_ask_category_id = true if show_categories || ask_setting.default_setting[field] if categories.count > 1 - all_fields << {'field'=>field,'style_html'=>'','label'=>ask_label(@default_ask_setting.field_name("ask_category_id"),'true'),'content'=>select_tag('ask_question[category_id]', options_for_select(categories.collect{|t| [ t.title, t.id ]}))} + id = "ask_question[category_id]" + all_fields << {'field'=>field,'style_html'=>'','label'=>ask_label(id, @default_ask_setting.field_name("ask_category_id"),'true'),'content'=>select_tag('ask_question[category_id]', options_for_select(categories.collect{|t| [ t.title, t.id ]}))} else - all_fields << {'field'=>field,'style_html'=>'','label'=>ask_label(@default_ask_setting.field_name("ask_category_id"),'true'),'content'=>"#{(categories[0].title rescue '')}"+hidden_field_tag('ask_question[category_id]', (categories[0].id.to_s rescue ''))} + all_fields << {'field'=>field,'style_html'=>'','label'=>ask_label(nil, @default_ask_setting.field_name("ask_category_id"),'true'),'content'=>"#{(categories[0].title rescue '')}"+hidden_field_tag('ask_question[category_id]', (categories[0].id.to_s rescue ''))} end else all_fields << {'field'=>field,'style_html'=>'display: none;','label'=>'','content'=>hidden_field_tag('ask_question[category_id]', (categories[0].id.to_s rescue ''))} @@ -419,15 +422,17 @@ class AsksController < ApplicationController else if ask_setting.default_setting[field] || field == "usage_rule" required = ask_setting.is_required(field) - f1 = {'style_html'=>'','label'=>ask_label(@default_ask_setting.field_name("#{field}"),required.to_s)} + f1 = {'style_html'=>''} field_name = "ask_question[#{field}]" placeholder = @default_ask_setting.prompt_word(field) + id = field_name case field when 'title' f1['content'] = text_field_tag(field_name,nil,placeholder: placeholder,required: required) when 'name' f1['content'] = text_field_tag(field_name,nil,data: (required ? {"fv-validation" => "required;", "fv-messages" => "必填欄位;"} : {}),required: required,placeholder: placeholder) when 'sex' + id += "_male" f1['content'] = " @@ -444,18 +449,21 @@ class AsksController < ApplicationController else @appointment_idx += 1 end - f1['content'] = "