diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index 1177c0e..12be007 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -18,7 +18,7 @@ class Admin::AsksController < OrbitAdminController end def print_setting @set = nil - @cats_relations = get_categories_info + @cats_relations = get_categories_info_for_ask @category_id = (params[:category] || @cats_relations[0][0] rescue nil) if @category_id.blank? @set = AskPrintSetting.first @@ -123,7 +123,7 @@ class Admin::AsksController < OrbitAdminController set_input_name_for_ask('ask_category_setting[custom_fields]') view_context.set_input_name_for_ask('ask_category_setting[custom_fields]') #prevent not setting variables html = apply_fields.map do |k| - view_context.custom_field_block("default@#{k}", custom_fields[k]) + view_context.custom_field_block_for_ask("default@#{k}", custom_fields[k]) end.join("\n") else ask_setting.delete_customs_func(apply_fields, true) @@ -426,7 +426,7 @@ class Admin::AsksController < OrbitAdminController @ask_question = AskQuestion.find(params[:id]) end def order_fields - @cats_relations = get_categories_info + @cats_relations = get_categories_info_for_ask @category_id = (params[:category] || @cats_relations[0][0] rescue nil) @disp_fields_infos = AskSetting.get_disp_fields_infos(false,@category_id) end diff --git a/app/helpers/admin/asks_helper.rb b/app/helpers/admin/asks_helper.rb index faf2093..c6a14c9 100644 --- a/app/helpers/admin/asks_helper.rb +++ b/app/helpers/admin/asks_helper.rb @@ -10,7 +10,7 @@ module Admin::AsksHelper extend ActionView::Helpers::UrlHelper extend OrbitFormHelper extend Ckeditor::Helpers::FormHelper - def get_categories_info + def get_categories_info_for_ask current_user = OrbitHelper.current_user OrbitHelper.set_params(params,current_user) OrbitHelper.set_this_module_app("ask") @@ -41,7 +41,7 @@ module Admin::AsksHelper def get_input_name_for_ask @input_name end - def create_lang_panel(field) + def create_lang_panel_for_ask(field) tmp2 = content_tag(:div,:class => 'btn-group', :data=>{:toggle=>"buttons-radio"}) do I18n.available_locales.collect do |key| link_entry_ary = ["##{field}","_#{key}"] @@ -50,7 +50,7 @@ module Admin::AsksHelper end.join.html_safe end end - def multiple_lang_show_tag(field_name, index1,field,value=nil,combine_element='',exteral_options={},sortable=false) + def multiple_lang_show_tag_for_ask(field_name, index1,field,value=nil,combine_element='',exteral_options={},sortable=false) if !index1.nil? all_field = (get_input_name_for_ask + "[#{index1}][#{field}][parant]").gsub(/[\[@]/,'_').gsub(/\]/,'') else @@ -62,7 +62,7 @@ module Admin::AsksHelper value_locale = value[locale.to_s] rescue nil "
#{e.inspect}
#{e.backtrace.to_yaml}"
end
end
- def custom_field_block(k,v={},show_only=false, other_first_rows="",extra_class="")
+ def custom_field_block_for_ask(k,v={},show_only=false, other_first_rows="",extra_class="")
markups = LIST[:markups].select{|k,v| k != 'member_relationship' && k != 'address'}.collect{|key,val| [t("lists.markups."+key),key]} +[[t('ask.file_field'),'file'],[t('ask.image_field'),'image'],[t('ask.instructions'),'instructions']]
if show_only
- multi_lang_tag = multiple_lang_show_tag(t('ask.field_name'),k,'field',v['field'])
+ multi_lang_tag = multiple_lang_show_tag_for_ask(t('ask.field_name'),k,'field',v['field'])
require_ask_tag = "