diff options
| author | jpl | 2017-03-16 15:54:17 +0100 |
|---|---|---|
| committer | jpl | 2017-03-16 15:54:17 +0100 |
| commit | cd148f8a61ea468dbf241e6235987de0ee9457e6 (patch) | |
| tree | 2e89414bb9c2eafaceebcad72c87719a3923c7e1 | |
| parent | 78ba8bca32a79edb3928fb5c30f2cf2247aede69 (diff) | |
| download | chouette-core-cd148f8a61ea468dbf241e6235987de0ee9457e6.tar.bz2 | |
Refs #2858: updating table sorting helper methods
| -rw-r--r-- | app/helpers/newapplication_helper.rb | 8 | ||||
| -rw-r--r-- | app/views/referential_stop_areas/_stop_areas.html.slim | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/_stop_areas.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/app/helpers/newapplication_helper.rb b/app/helpers/newapplication_helper.rb index c4ea0a200..c9da544d1 100644 --- a/app/helpers/newapplication_helper.rb +++ b/app/helpers/newapplication_helper.rb @@ -16,11 +16,11 @@ module NewapplicationHelper end columns.map do |k, v| - # if k.is_a? Symbol + if ["ID Codif", "Oid", "OiD", "ID Reflex", "Arrêt de départ", "Arrêt d'arrivée"].include? k + hcont << content_tag(:th, k) + else hcont << content_tag(:th, sortable_columns(collection, k)) - # else - # hcont << content_tag(:th, k) - # end + end end hcont << content_tag(:th, '') if actions.any? diff --git a/app/views/referential_stop_areas/_stop_areas.html.slim b/app/views/referential_stop_areas/_stop_areas.html.slim index 081518abf..abfd7e95e 100644 --- a/app/views/referential_stop_areas/_stop_areas.html.slim +++ b/app/views/referential_stop_areas/_stop_areas.html.slim @@ -1,6 +1,6 @@ - if @stop_areas.any? = table_builder @stop_areas, - { 'Object_id' => 'objectid', :name => 'name', :registration_number => 'registration_number', :city_name => 'city_name', :zip_code => 'zip_code' }, + { 'OiD' => 'objectid', :name => 'name', :registration_number => 'registration_number', :city_name => 'city_name', :zip_code => 'zip_code' }, [:show, :edit, :delete], [], 'table table-bordered' diff --git a/app/views/stop_areas/_stop_areas.html.slim b/app/views/stop_areas/_stop_areas.html.slim index 2155e341a..24e1c84ae 100644 --- a/app/views/stop_areas/_stop_areas.html.slim +++ b/app/views/stop_areas/_stop_areas.html.slim @@ -1,6 +1,6 @@ - if @stop_areas.any? = table_builder @stop_areas, - { 'Object_id' => 'objectid', + { 'OiD' => 'objectid', :name => 'name', :registration_number => 'registration_number', :city_name => 'city_name', :zip_code => 'zip_code' }, [:show, :edit, :delete], diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 387a05c06..d7492d07f 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -61,7 +61,11 @@ fr: attributes: line: network: "Réseau" + networks: + name: "Réseau" company: "Transporteur principal" + companies: + name: "Transporteur principal" registration_number: "Nom court" deactivated: "Activé" name: "Nom de la ligne" |