Merge branch 'staging'

2016-12-01 11:05:48 +01:00 · 2016-12-01 11:05:48 +01:00 · 93ce326b63
commit 93ce326b63
parent 8229694e86 bf8d2f0f20
1 changed files with 2 additions and 1 deletions
--- a/app/views/users/description/champs/_drop_down_list.html.haml
+++ b/app/views/users/description/champs/_drop_down_list.html.haml
@ -1 +1,2 @@
-= render partial: 'users/description/champs/drop_down_template', locals: {values: champ.drop_down_list.options, champ: champ}
+- unless champ.drop_down_list.nil?
+  = render partial: 'users/description/champs/drop_down_template', locals: {values: champ.drop_down_list.options, champ: champ}