diff options
| author | Luc Donnet | 2015-05-05 13:45:35 +0200 | 
|---|---|---|
| committer | Luc Donnet | 2015-05-05 13:45:35 +0200 | 
| commit | dc16d9843811c5c8c2f863a840336be768418b3a (patch) | |
| tree | f6193610b3133d18ed414e6ec4968e8c1ce005d3 /config | |
| parent | 7cd1d88d33644731a5962856392f59d4f97ea286 (diff) | |
| download | chouette-core-dc16d9843811c5c8c2f863a840336be768418b3a.tar.bz2 | |
Add reference_ids to export task
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/enumerize.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/enumerize.fr.yml | 1 | ||||
| -rw-r--r-- | config/locales/export_tasks.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/export_tasks.fr.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 6 | 
5 files changed, 6 insertions, 4 deletions
diff --git a/config/locales/enumerize.en.yml b/config/locales/enumerize.en.yml index f65885ee8..b564e7f83 100644 --- a/config/locales/enumerize.en.yml +++ b/config/locales/enumerize.en.yml @@ -16,7 +16,6 @@ en:        request_stop: "Drop off if requested"        is_flexible: "Booking requested for drop off"      references_type: -      all: "All datas"        network: "Networks"        line: "Lines"        company: "Companies" diff --git a/config/locales/enumerize.fr.yml b/config/locales/enumerize.fr.yml index 2902f1835..c5a02b5e7 100644 --- a/config/locales/enumerize.fr.yml +++ b/config/locales/enumerize.fr.yml @@ -16,7 +16,6 @@ fr:        request_stop: "Descente sur demande au conducteur"        is_flexible: "Descente sur réservation"      references_type: -      all: "Toutes les données"        network: "Réseaux"        line: "Lignes"        company: "Transporteurs" diff --git a/config/locales/export_tasks.en.yml b/config/locales/export_tasks.en.yml index a2cb4bc35..9770c72ad 100644 --- a/config/locales/export_tasks.en.yml +++ b/config/locales/export_tasks.en.yml @@ -4,6 +4,7 @@ en:        new: "New export"      new:        title: "New export" +      all: "All"        flash: "Export task on queue, refresh page to see progression"        fields_gtfs_export:          warning: "Filter on stop areas export only GTFS stops and transfers files, these may contain extra attributes"     diff --git a/config/locales/export_tasks.fr.yml b/config/locales/export_tasks.fr.yml index e5e3eaea6..35deec1b1 100644 --- a/config/locales/export_tasks.fr.yml +++ b/config/locales/export_tasks.fr.yml @@ -4,6 +4,7 @@ fr:        new: "Nouvel export"      new:        title: "Nouvel export" +      all: "Tous"        flash: "La demande d'export est mise en file d'attente, veuillez rafraichir régulièrement la page pour en suivre la progression"        fields_gtfs_export:          warning: "Le filtre sur arrêts exporte uniquement les fichiers GTFS stops et transfers gtfs, ceux-ci pouvant contenir des attributs supplémentaires" diff --git a/config/routes.rb b/config/routes.rb index fb1568dea..879e9bc23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -89,11 +89,13 @@ ChouetteIhm::Application.routes.draw do        resources :compliance_check_results      end -    resources :export_tasks, :only => [:new, :create] -    resources :exports, :only => [:index, :show, :destroy]  do +    resources :export_tasks, :only => [:new, :create] do        collection do          get 'references'        end +    end +     +    resources :exports, :only => [:index, :show, :destroy]  do        member do          get "exported_file"        end  | 
