aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume2017-10-31 16:43:30 +0100
committerGuillaume2017-10-31 16:43:38 +0100
commit8c3844790fb6964f520930a57c14704f4424eeb6 (patch)
tree7e3b4427e39516c414e151ceec8e20eee8180ee6
parentbbf272a31447912af9b6240889dff8edb98a6bc5 (diff)
downloadchouette-core-8c3844790fb6964f520930a57c14704f4424eeb6.tar.bz2
fix helper transport_modes for show only a transport_mode if transport_submode is not informed Refs #4812
-rw-r--r--app/helpers/compliance_control_blocks_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/compliance_control_blocks_helper.rb b/app/helpers/compliance_control_blocks_helper.rb
index 09e22d6e9..5c279b33a 100644
--- a/app/helpers/compliance_control_blocks_helper.rb
+++ b/app/helpers/compliance_control_blocks_helper.rb
@@ -1,10 +1,10 @@
module ComplianceControlBlocksHelper
def transport_mode(transport_mode, transport_submode)
- if (transport_mode) && (transport_submode) != ""
- transportMode = "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]"
+ return "[Tous les modes de transport]" if transport_mode == ""
+ if transport_submode == ""
+ "[" + t("enumerize.transport_mode.#{transport_mode}") + "]"
else
- transportMode = "[Tous les modes de transport]"
+ "[" + t("enumerize.transport_mode.#{transport_mode}") + "]" + "[" + t("enumerize.transport_submode.#{transport_submode}") + "]"
end
- transportMode
end
end \ No newline at end of file