Merge branch 'develop' into staging

This commit is contained in:
Xavier J 2016-10-28 12:14:36 +02:00
commit f18e4beaf6

View file

@ -53,7 +53,7 @@
'data-provide' => champ.data_provide, 'data-provide' => champ.data_provide,
'data-date-format' => champ.data_date_format} 'data-date-format' => champ.data_date_format}
- unless champ.description.empty? - unless champ.description.empty? || champ.type_champ == 'engagement'
.row .row
.col-lg-8.col-md-8{class: 'description_div', id:"description_champs_#{champ.id}"} .col-lg-8.col-md-8{class: 'description_div', id:"description_champs_#{champ.id}"}
= champ.description = champ.description