diff options
| author | Vlatka Pavisic | 2017-04-11 15:35:01 +0200 |
|---|---|---|
| committer | Vlatka Pavisic | 2017-04-11 15:35:01 +0200 |
| commit | aa481c087b162bc775b4418e205f91c5b6bead19 (patch) | |
| tree | 914ba9b39e0338317bcc2bfd839f745647beda1a /config | |
| parent | 8adf909694b52959483818bf839d6e180015eb99 (diff) | |
| download | chouette-core-aa481c087b162bc775b4418e205f91c5b6bead19.tar.bz2 | |
Refs #3047: Associate RoutingConstraintZone with StopPoints
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/routing_constraint_zones.en.yml | 7 | ||||
| -rw-r--r-- | config/locales/routing_constraint_zones.fr.yml | 7 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/routing_constraint_zones.en.yml b/config/locales/routing_constraint_zones.en.yml index 7012a1493..e3e281d38 100644 --- a/config/locales/routing_constraint_zones.en.yml +++ b/config/locales/routing_constraint_zones.en.yml @@ -9,6 +9,12 @@ en: line: Line created_at: Created at updated_at: Updated at + errors: + models: + routing_constraint_zone: + attributes: + stop_points: + stop_points_not_from_route: 'Stop point does not belong to the Route of this Routing constraint zone.' routing_constraint_zones: actions: new: New routing constraint zone @@ -21,3 +27,4 @@ en: title: "Update routing constraint zone %{routing_constraint_zone}" show: title: "Routing constraint zone %{routing_constraint_zone}" + diff --git a/config/locales/routing_constraint_zones.fr.yml b/config/locales/routing_constraint_zones.fr.yml index bb4d8bcd2..5b663e00c 100644 --- a/config/locales/routing_constraint_zones.fr.yml +++ b/config/locales/routing_constraint_zones.fr.yml @@ -9,6 +9,13 @@ fr: line: Ligne created_at: "Créé le" updated_at: "Edité le" + errors: + models: + routing_constraint_zone: + attributes: + stop_points: + not_enough_stop_points: "Il faut mettre au moins deux arrêts sur séquence d'arrêts." + stop_points_not_from_route: "Arrêt sur séquence d'arrêts n'appartient pas à la Route de cette Zone de contrainte." routing_constraint_zones: actions: new: Ajouter une zone de contrainte diff --git a/config/routes.rb b/config/routes.rb index 12dbf0986..692972315 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -123,6 +123,7 @@ ChouetteIhm::Application.routes.draw do end resources :vehicle_journey_imports resources :vehicle_journey_exports + resources :stop_points, only: :index, controller: 'route_stop_points' end resources :routing_constraint_zones end |