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

11
app/controllers/admin/configs_controller.rb
View file

@ -41,9 +41,14 @@ class Admin::ConfigsController < Admin::BaseController
def parse_recurring_selects!(config)
if config
for k in [:pickup, :ends] do
if config[k] && config[k][:recurr]
config[k][:recurr] = ActiveSupport::JSON.decode(config[k][:recurr])
config[k][:recurr] = FoodsoftDateUtil.rule_from(config[k][:recurr]).to_ical if config[k][:recurr]
if config[k]
# allow clearing it using dummy value '{}' ('' would break recurring_select)
if config[k][:recurr].present? && config[k][:recurr] != '{}'
config[k][:recurr] = ActiveSupport::JSON.decode(config[k][:recurr])
config[k][:recurr] = FoodsoftDateUtil.rule_from(config[k][:recurr]).to_ical if config[k][:recurr]
else
config[k] = nil
end
end
end
end