Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-10-03 12:43:24 +02:00
commit 16448af341

View file

@ -1,13 +1,14 @@
%select{ name:"champs['#{champ.id}']", %select{ name:"champs['#{champ.id}']",
id: "champs_#{champ.id}" } id: "champs_#{champ.id}" }
- champ.drop_down_list.options.each do |option| - unless champ.drop_down_list.blank?
- if (option=~ /^--.*--$/).nil? - champ.drop_down_list.options.each do |option|
- if champ.value == option - if (option=~ /^--.*--$/).nil?
%option{selected:''} - if champ.value == option
%option{selected:''}
= option
- else
%option
= option
-else
%option{disabled:''}
= option = option
- else
%option
= option
-else
%option{disabled:''}
= option