Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Followup fix for issue #1752 - tree got lost after update.

Browse source
This commit is contained in:
Martin Edenhofer 2018-03-29 03:07:13 +02:00
parent 968074d8ef
commit a088321498
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/object_manager_attributes_controller.rb
View file

@ -127,7 +127,7 @@ class ObjectManagerAttributesController < ApplicationController
permitted[:data_option][:null] = true
end
if !permitted[:data_option][:options].is_a?(Hash)
if !permitted[:data_option][:options].is_a?(Hash) && !permitted[:data_option][:options].is_a?(Array)
permitted[:data_option][:options] = {}
end

4
db/migrate/20180220171219_check_for_object_attributes.rb
View file

@ -21,12 +21,12 @@ class CheckForObjectAttributes < ActiveRecord::Migration[5.1]
end
def fix_nil_data_option(attribute)
return if attribute[:data_option].is_a?(Hash)
return if attribute[:data_option].is_a?(Hash) || attribute[:data_option][:options].is_a?(Array)
attribute[:data_option] = {}
end
def fix_options(attribute)
return if attribute[:data_option][:options].is_a?(Hash)
return if attribute[:data_option][:options].is_a?(Hash) || attribute[:data_option][:options].is_a?(Array)
attribute[:data_option][:options] = {}
end