aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorZakaria BOUZIANE2014-12-15 16:49:41 +0100
committerZakaria BOUZIANE2014-12-15 16:49:41 +0100
commit070c2fae3b7a3fc32e87bdfc2404c1657d2ecd2b (patch)
treeab93d6ad47ddcb114aa983f3a76cd0b5444ad5b7 /app
parent4a38f7e0c6cf879fcd050b0b078cd488065a2202 (diff)
parente85c9a8ee0aa0b1058b478879f538ef2c09d23da (diff)
downloadchouette-core-070c2fae3b7a3fc32e87bdfc2404c1657d2ecd2b.tar.bz2
Merge branch 'V2_5' of https://github.com/afimb/chouette2 into V2_5
Diffstat (limited to 'app')
-rw-r--r--app/views/connection_links/show.html.erb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index 58649d245..0771caac4 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -22,7 +22,11 @@
</p>
<p>
<label><%= @connection_link.human_attribute_name("connection_link_type") %>: </label>
- <%= t("connection_link_types.label.#{@connection_link.connection_link_type}") %>
+ <% if @connection_link.connection_link_type.blank? %>
+ <%= t("connection_link_types.label.undefined") %>
+ <% else %>
+ <%= t("connection_link_types.label.#{@connection_link.connection_link_type}") %>
+ <% end %>
</p>
<p>
<label><%= @connection_link.human_attribute_name("comment") %>: </label>