diff options
| author | Vlatka Pavisic | 2017-04-11 15:40:45 +0200 |
|---|---|---|
| committer | Vlatka Pavisic | 2017-04-11 15:40:45 +0200 |
| commit | 28609cb29c9a637ac32c0b54a793efb66ca3ae1a (patch) | |
| tree | 71ab9c9ec39eea5983872d44795dafa346079855 /app/helpers/newapplication_helper.rb | |
| parent | aa481c087b162bc775b4418e205f91c5b6bead19 (diff) | |
| parent | fa17af2fbda1266af88cf05bcb7765abda745cb4 (diff) | |
| download | chouette-core-28609cb29c9a637ac32c0b54a793efb66ca3ae1a.tar.bz2 | |
Refs #3047 : Merge
Diffstat (limited to 'app/helpers/newapplication_helper.rb')
| -rw-r--r-- | app/helpers/newapplication_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/newapplication_helper.rb b/app/helpers/newapplication_helper.rb index f5b898731..42fca489f 100644 --- a/app/helpers/newapplication_helper.rb +++ b/app/helpers/newapplication_helper.rb @@ -16,7 +16,7 @@ module NewapplicationHelper end columns.map do |k, v| - if ["ID Codif", "Oid", "OiD", "ID Reflex", "Arrêt de départ", "Arrêt d'arrivée"].include? k + if ["ID Codif", "Oid", "OiD", "ID Reflex", "Arrêt de départ", "Arrêt d'arrivée", "Période de validité englobante"].include? k hcont << content_tag(:th, k) else hcont << content_tag(:th, sortable_columns(collection, k)) @@ -48,7 +48,7 @@ module NewapplicationHelper else item.try(attribute) end - if attribute == 'name' + if attribute == 'name' or attribute == 'comment' lnk = [] unless item.class == Calendar or item.class == Referential @@ -58,7 +58,7 @@ module NewapplicationHelper lnk << item.route.line if item.class == Chouette::RoutingConstraintZone lnk << item if item.respond_to? :line_referential lnk << item.stop_area if item.respond_to? :stop_area - lnk << item if item.respond_to? :stop_points + lnk << item if item.respond_to? :stop_points or item.class.to_s == 'Chouette::TimeTable' elsif item.respond_to? :referential lnk << item.referential end @@ -109,7 +109,7 @@ module NewapplicationHelper polymorph_url << item.route.line if item.class == Chouette::RoutingConstraintZone polymorph_url << item if item.respond_to? :line_referential polymorph_url << item.stop_area if item.respond_to? :stop_area - polymorph_url << item if item.respond_to? :stop_points + polymorph_url << item if item.respond_to? :stop_points or item.class.to_s == 'Chouette::TimeTable' elsif item.respond_to? :referential polymorph_url << item.referential end |