DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

multiple_select: fix decorateur interference

Browse source
This commit is contained in:
Simon Lehericey 2017-03-15 18:32:20 +01:00
parent b3624256cd
commit ebd2051337
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/drop_down_list.rb
View file

@ -11,7 +11,7 @@ class DropDownList < ActiveRecord::Base
end
def selected_options(champ)
champ.value.blank? ? [] : multiple ? JSON.parse(champ.value) : [champ.value]
champ.object.value.blank? ? [] : multiple ? JSON.parse(champ.object.value) : [champ.object.value]
end
def multiple

5
spec/models/drop_down_list_spec.rb
View file

@ -41,7 +41,6 @@ ouaich" }
end
describe 'selected_options' do
let(:dropdownlist) do
create(:drop_down_list, type_de_champ: type_de_champ)
end
@ -49,14 +48,14 @@ ouaich" }
context 'when multiple' do
let(:type_de_champ) { TypeDeChamp.new(type_champ: 'multiple_drop_down_list') }
let(:champ) { Champ.new(value: '["1","2"]') }
let(:champ) { Champ.new(value: '["1","2"]').decorate }
it { expect(dropdownlist.selected_options(champ)).to match(['1', '2']) }
end
context 'when simple' do
let(:type_de_champ) { TypeDeChamp.new(type_champ: 'drop_down_list') }
let(:champ) { Champ.new(value: '1') }
let(:champ) { Champ.new(value: '1').decorate }
it { expect(dropdownlist.selected_options(champ)).to match(['1']) }
end
end