Merge branch 'develop' into staging
This commit is contained in:
commit
6bddf2fb5b
1 changed files with 2 additions and 2 deletions
|
@ -42,9 +42,9 @@
|
||||||
- if preference.table.nil? || preference.table.empty?
|
- if preference.table.nil? || preference.table.empty?
|
||||||
- value = dossier.decorate.public_send(preference.attr_decorate)
|
- value = dossier.decorate.public_send(preference.attr_decorate)
|
||||||
- elsif preference.table == 'champs'
|
- elsif preference.table == 'champs'
|
||||||
- value = dossier.champs.find_by_type_de_champ_id(preference.attr).value
|
- value = dossier.champs.find_by_type_de_champ_id(preference.attr).value rescue nil
|
||||||
- elsif preference.table == 'champs_private'
|
- elsif preference.table == 'champs_private'
|
||||||
- value = dossier.champs_private.find_by_type_de_champ_id(preference.attr).value
|
- value = dossier.champs_private.find_by_type_de_champ_id(preference.attr).value rescue nil
|
||||||
- else
|
- else
|
||||||
- begin
|
- begin
|
||||||
- value = dossier.public_send(preference.table).decorate.public_send(preference.attr_decorate)
|
- value = dossier.public_send(preference.table).decorate.public_send(preference.attr_decorate)
|
||||||
|
|
Loading…
Reference in a new issue