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

Fixed bug #1175: DynamicFields imported from OTRS are mandatory and stop input forms from submitting.

Browse source
This commit is contained in:
Thorsten Eckel 2017-08-23 16:41:01 +02:00
parent f35645e051
commit d6bc129af4
14 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/import/otrs/dynamic_field/checkbox.rb
View file

@ -11,7 +11,7 @@ module Import
true => 'Yes', true => 'Yes',
false => 'No', false => 'No',
}, },
null: false, null: true,
translate: true, translate: true,
} }
) )

2
lib/import/otrs/dynamic_field/date.rb
View file

@ -14,7 +14,7 @@ module Import
future: dynamic_field['Config']['YearsInFuture'] != '0', future: dynamic_field['Config']['YearsInFuture'] != '0',
past: dynamic_field['Config']['YearsInPast'] != '0', past: dynamic_field['Config']['YearsInPast'] != '0',
diff: dynamic_field['Config']['DefaultValue'].to_i / 60 / 60 / 24, diff: dynamic_field['Config']['DefaultValue'].to_i / 60 / 60 / 24,
null: false, null: true,
} }
) )
end end

2
lib/import/otrs/dynamic_field/date_time.rb
View file

@ -14,7 +14,7 @@ module Import
future: dynamic_field['Config']['YearsInFuture'] != '0', future: dynamic_field['Config']['YearsInFuture'] != '0',
past: dynamic_field['Config']['YearsInPast'] != '0', past: dynamic_field['Config']['YearsInPast'] != '0',
diff: dynamic_field['Config']['DefaultValue'].to_i / 60 / 60, diff: dynamic_field['Config']['DefaultValue'].to_i / 60 / 60,
null: false, null: true,
} }
) )
end end

11
lib/import/otrs/dynamic_field/dropdown.rb
View file

@ -6,11 +6,12 @@ module Import
@attribute_config.merge!( @attribute_config.merge!(
data_type: 'select', data_type: 'select',
data_option: { data_option: {
default: '', default: '',
multiple: false, multiple: false,
options: dynamic_field['Config']['PossibleValues'], options: dynamic_field['Config']['PossibleValues'],
null: dynamic_field['Config']['PossibleNone'] == '1', nulloption: dynamic_field['Config']['PossibleNone'] == '1',
translate: dynamic_field['Config']['TranslatableValues'] == '1', null: true,
translate: dynamic_field['Config']['TranslatableValues'] == '1',
} }
) )
end end

11
lib/import/otrs/dynamic_field/multiselect.rb
View file

@ -6,11 +6,12 @@ module Import
@attribute_config.merge!( @attribute_config.merge!(
data_type: 'select', data_type: 'select',
data_option: { data_option: {
default: '', default: '',
multiple: true, multiple: true,
options: dynamic_field['Config']['PossibleValues'], options: dynamic_field['Config']['PossibleValues'],
null: dynamic_field['Config']['PossibleNone'] == '1', nulloption: dynamic_field['Config']['PossibleNone'] == '1',
translate: dynamic_field['Config']['TranslatableValues'] == '1', null: true,
translate: dynamic_field['Config']['TranslatableValues'] == '1',
} }
) )
end end

2
lib/import/otrs/dynamic_field/text.rb
View file

@ -9,7 +9,7 @@ module Import
default: dynamic_field['Config']['DefaultValue'], default: dynamic_field['Config']['DefaultValue'],
type: 'text', type: 'text',
maxlength: 255, maxlength: 255,
null: false, null: true,
} }
) )
end end

2
lib/import/otrs/dynamic_field/text_area.rb
View file

@ -8,7 +8,7 @@ module Import
data_option: { data_option: {
default: dynamic_field['Config']['DefaultValue'], default: dynamic_field['Config']['DefaultValue'],
rows: dynamic_field['Config']['Rows'], rows: dynamic_field['Config']['Rows'],
null: false, null: true,
} }
) )
end end

2
spec/lib/import/otrs/dynamic_field/checkbox_spec.rb
View file

@ -29,7 +29,7 @@ RSpec.describe Import::OTRS::DynamicField::Checkbox do
true => 'Yes', true => 'Yes',
false => 'No' false => 'No'
}, },
null: false, null: true,
translate: true translate: true
} }
} }

2
spec/lib/import/otrs/dynamic_field/date_spec.rb
View file

@ -33,7 +33,7 @@ RSpec.describe Import::OTRS::DynamicField::Date do
future: false, future: false,
past: false, past: false,
diff: 0, diff: 0,
null: false null: true
} }
} }

2
spec/lib/import/otrs/dynamic_field/date_time_spec.rb
View file

@ -33,7 +33,7 @@ RSpec.describe Import::OTRS::DynamicField::DateTime do
future: true, future: true,
past: true, past: true,
diff: 72, diff: 72,
null: false null: true
} }
} }

5
spec/lib/import/otrs/dynamic_field/dropdown_spec.rb
View file

@ -32,8 +32,9 @@ RSpec.describe Import::OTRS::DynamicField::Dropdown do
'Köln' => 'Köln', 'Köln' => 'Köln',
'Berlin' => 'Berlin' 'Berlin' => 'Berlin'
}, },
null: true, nulloption: true,
translate: false null: true,
translate: false
} }
} }

5
spec/lib/import/otrs/dynamic_field/multiselect_spec.rb
View file

@ -32,8 +32,9 @@ RSpec.describe Import::OTRS::DynamicField::Multiselect do
'Köln' => 'Köln', 'Köln' => 'Köln',
'Berlin' => 'Berlin' 'Berlin' => 'Berlin'
}, },
null: false, nulloption: false,
translate: false null: true,
translate: false
} }
} }

2
spec/lib/import/otrs/dynamic_field/text_area_spec.rb
View file

@ -26,7 +26,7 @@ RSpec.describe Import::OTRS::DynamicField::TextArea do
data_option: { data_option: {
default: '', default: '',
rows: '20', rows: '20',
null: false null: true
} }
} }

2
spec/lib/import/otrs/dynamic_field/text_spec.rb
View file

@ -27,7 +27,7 @@ RSpec.describe Import::OTRS::DynamicField::Text do
default: '', default: '',
type: 'text', type: 'text',
maxlength: 255, maxlength: 255,
null: false null: true
} }
} }