diff options
| author | Vlatka Pavisic | 2017-04-28 11:51:05 +0200 |
|---|---|---|
| committer | Vlatka Pavisic | 2017-04-28 11:51:05 +0200 |
| commit | 25963e147673c465298fb0e15a3786993e5c70ee (patch) | |
| tree | e7d30009a8093130481633a1907f50cd8120bd7e | |
| parent | d9a465dbdfed5ab1dfd670fc84abe31192847cd5 (diff) | |
| download | chouette-core-25963e147673c465298fb0e15a3786993e5c70ee.tar.bz2 | |
Refs #3109 : Order filter options on Lines page
| -rw-r--r-- | app/views/shared/_lines_search_form.html.slim | 4 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/views/shared/_lines_search_form.html.slim b/app/views/shared/_lines_search_form.html.slim index 0d4fedbc0..3bc84a3ad 100644 --- a/app/views/shared/_lines_search_form.html.slim +++ b/app/views/shared/_lines_search_form.html.slim @@ -19,6 +19,6 @@ .col-xs-3 = f.select(:company_id_eq, referential.companies.collect { |c| [c.name, c.id] }.unshift([t("lines.index.no_networks"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_companies") }) .col-xs-3 - = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") }) + = f.select(:transport_mode_eq, Chouette::Line.transport_mode.values.collect { |v| [ I18n.t("enumerize.line.transport_mode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_modes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_modes") }) .col-xs-3 - = f.select(:transport_submode_eq, Chouette::Line.transport_submode.values.collect { |v| [ I18n.t("enumerize.line.transport_submode.#{v}"), v] }.unshift([t("lines.index.no_transport_submodes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_submodes") }) + = f.select(:transport_submode_eq, Chouette::Line.transport_submode.values.collect { |v| [ I18n.t("enumerize.line.transport_submode.#{v}"), v] }.sort.unshift([t("lines.index.no_transport_submodes"), -1]), { include_blank: '' }, { class: 'form-control', style: 'width: 100%', 'data-select2ed': 'true', 'data-select2ed-placeholder': t("lines.index.all_transport_submodes") }) diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index bcb50aa9a..f3e0ee4a2 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -59,6 +59,7 @@ en: other: "lines" attributes: line: + id: "ID" network: "Network" networks: name: "Network" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 869ac8ce2..978e516dd 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -59,6 +59,7 @@ fr: other: "lignes" attributes: line: + id: "ID" network: "Réseau" networks: name: "Réseau" |