diff options
| author | jpl | 2017-02-09 14:40:41 +0100 |
|---|---|---|
| committer | jpl | 2017-02-09 14:40:41 +0100 |
| commit | 9ce7eeafabfa62a23db02a6dda584a06325c9260 (patch) | |
| tree | ebf1f9a8e938502cac608867d6da94d2304201d0 | |
| parent | aac370c4966ff6587ce108cb507c12891e8bd59e (diff) | |
| download | chouette-core-9ce7eeafabfa62a23db02a6dda584a06325c9260.tar.bz2 | |
Refs #2482: updating referentials#show table column names
| -rw-r--r-- | app/controllers/referentials_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/referentials/_filters.html.slim | 3 | ||||
| -rw-r--r-- | app/views/referentials/show.html.slim | 2 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index 6dbfc423d..5ff296659 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -32,7 +32,7 @@ class ReferentialsController < BreadcrumbController } format.html { build_breadcrumb :show} end - p "test" + @reflines = lines_collection.paginate(page: params[:page], per_page: 10) end diff --git a/app/views/referentials/_filters.html.slim b/app/views/referentials/_filters.html.slim index bdac48a52..2eb0c46ac 100644 --- a/app/views/referentials/_filters.html.slim +++ b/app/views/referentials/_filters.html.slim @@ -1,3 +1,6 @@ += search_form_for @q, url: referential_path(@referential.id), class: 'form form-filter' do |f| + + .form.form-filter .form-group.togglable .control-label Mode(s) diff --git a/app/views/referentials/show.html.slim b/app/views/referentials/show.html.slim index 8d645e511..6cc6e0ba9 100644 --- a/app/views/referentials/show.html.slim +++ b/app/views/referentials/show.html.slim @@ -66,7 +66,7 @@ / ID Codif, nom court, nom de la ligne, réseau, mode, transporteur principal, actions = [show, edit_notes] = table_builder @reflines, - { 'ID Codif' => Proc.new { |n| n.objectid.local_id }, @reflines.human_attribute_name(:id) => 'id', + { 'ID Codif' => Proc.new { |n| n.objectid.local_id }, @reflines.human_attribute_name(:registration_number) => 'registration_number', @reflines.human_attribute_name(:name) => 'name', @reflines.human_attribute_name(:network) => Proc.new { |n| n.try(:network).try(:name) }, @reflines.human_attribute_name(:transport_mode) => 'transport_mode', @reflines.human_attribute_name(:company) => Proc.new { |n| n.try(:company).try(:name) } }, diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 09efdc649..f59d0afea 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -60,7 +60,7 @@ fr: line: network: "Réseau" company: "Transporteur principal" - registration_number: "Numéro d'enregistrement" + registration_number: "Nom court" name: "Nom de la ligne" published_name: "Nom public" number: "Indice" |