Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Allow clearing default order schedule

Browse source
This commit is contained in:
wvengen 2015-10-23 14:53:01 +02:00
parent 61a5314b95
commit c1413ff817
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/helpers/admin/configs_helper.rb
View file

@ -59,6 +59,7 @@ module Admin::ConfigsHelper
options[:value] = FoodsoftDateUtil.rule_from(options[:value])
options[:rules] ||= []
options[:rules].unshift options[:value] unless options[:value].blank?
options[:rules].push [I18n.t('recurring_select.not_recurring'), '{}'] if options.delete(:allow_blank) # blank after current value
form.select_recurring key, options.delete(:rules).uniq, options
else
form.input_field key, options
@ -73,7 +74,7 @@ module Admin::ConfigsHelper
head = content_tag :label do
lbl = options[:label] || config_input_label(form, key)
field = config_input_field(form, key, as: :boolean, boolean_style: :inline,
data: {toggle: 'collapse', target: "##{key}-fields"})
data: {toggle: 'collapse', target: "##{key}-fields"})
content_tag :h4 do
# put in span to keep space for tooltip at right
content_tag :span, (lbl + field).html_safe, config_input_tooltip_options(form, key, {})