diff options
| author | Luc Donnet | 2018-03-14 08:00:27 +0100 |
|---|---|---|
| committer | GitHub | 2018-03-14 08:00:27 +0100 |
| commit | f04a77f9ef8a70630a1a71d6435528c7dfeb306f (patch) | |
| tree | 62f6bca8e2daf730e9ac380e03221f907b344970 | |
| parent | 7ccef25a79817223cf5cd8962f7de72279f33649 (diff) | |
| parent | d31db77f4a4bd4c43aea3b213db6cd13508a1d7a (diff) | |
| download | chouette-core-f04a77f9ef8a70630a1a71d6435528c7dfeb306f.tar.bz2 | |
Merge pull request #380 from af83/6158-compliance-check-transport-submode-display
Refs #6158 Fix display error when CC doesnt have transport submode
| -rw-r--r-- | app/views/compliance_checks/show.html.slim | 2 | ||||
| -rw-r--r-- | app/views/compliance_controls/show.html.slim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/compliance_checks/show.html.slim b/app/views/compliance_checks/show.html.slim index 8dd699c65..3b3861e0c 100644 --- a/app/views/compliance_checks/show.html.slim +++ b/app/views/compliance_checks/show.html.slim @@ -10,4 +10,4 @@ - if resource.compliance_check_block = definition_list t('compliance_controls.show.metadatas.compliance_check_block'), I18n.t('activerecord.attributes.compliance_control_blocks.transport_mode') => I18n.t("enumerize.transport_mode.#{resource.compliance_check_block.transport_mode}"), - I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => I18n.t("enumerize.transport_submode.#{resource.compliance_check_block.transport_submode}") + I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => resource.compliance_check_block.transport_submode.empty? ? I18n.t("enumerize.transport_submode.undefined") : I18n.t("enumerize.transport_submode.#{resource.compliance_check_block.transport_submode}") diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim index 6e7a45d12..643237676 100644 --- a/app/views/compliance_controls/show.html.slim +++ b/app/views/compliance_controls/show.html.slim @@ -10,4 +10,4 @@ - if @compliance_control.compliance_control_block = definition_list t('compliance_controls.show.metadatas.compliance_control_block'), I18n.t('activerecord.attributes.compliance_control_blocks.transport_mode') => I18n.t("enumerize.transport_mode.#{@compliance_control.compliance_control_block.transport_mode}"), - I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => I18n.t("enumerize.transport_submode.#{@compliance_control.compliance_control_block.transport_submode}") + I18n.t('activerecord.attributes.compliance_control_blocks.transport_submode') => @compliance_control.compliance_control_block.transport_submode.empty? ? I18n.t("enumerize.transport_submode.undefined") : I18n.t("enumerize.transport_submode.#{@compliance_control.compliance_control_block.transport_submode}") |