aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorZog2017-12-20 17:48:17 +0100
committerAlban Peignier2017-12-21 21:35:02 +0100
commite8285678efc9a62115fe0af4086c7a3959666bf8 (patch)
tree64b18197dff4d6707be10bfccca9240c601ffded /config
parent01b2d2b785d99c9b031269fc741b70ee9c248f16 (diff)
downloadchouette-core-5349-deactivate-stop-areas.tar.bz2
Refs #5349 @1h; Deactivate StopAreas instead of destroying them5349-deactivate-stop-areas
- Update decorators (had to split `action_links` because of `StopPointDecorator` inheriting from `StopAreaDecorator`) - Add methods on model - Add routes - Add actions on controller (`Activatable` concern, shared with `LinesController`) - Add I18n keys
Diffstat (limited to 'config')
-rw-r--r--config/locales/stop_areas.en.yml4
-rw-r--r--config/locales/stop_areas.fr.yml4
-rw-r--r--config/routes.rb12
3 files changed, 15 insertions, 5 deletions
diff --git a/config/locales/stop_areas.en.yml b/config/locales/stop_areas.en.yml
index 3ef3835e2..4d84d1191 100644
--- a/config/locales/stop_areas.en.yml
+++ b/config/locales/stop_areas.en.yml
@@ -17,6 +17,10 @@ en:
new: "Add a new stop"
edit: "Edit this stop"
destroy: "Remove"
+ activate: "Activate this stop"
+ deactivate: "Deactivate this stop"
+ activate_confirm: "Are you sure you want to activate this stop ?"
+ deactivate_confirm: "Are you sure you want tode activate this stop ?"
deleted_at: "Activated"
destroy_confirm: "Are you sure you want destroy this stop and all of his children ?"
select_parent: "Create or modify the relation child -> parent"
diff --git a/config/locales/stop_areas.fr.yml b/config/locales/stop_areas.fr.yml
index 69e3ba71e..eda1e4e3d 100644
--- a/config/locales/stop_areas.fr.yml
+++ b/config/locales/stop_areas.fr.yml
@@ -17,6 +17,10 @@ fr:
new: "Ajouter un arrêt"
edit: "Editer cet arrêt"
destroy: "Supprimer"
+ activate: "Activer cet arrêt"
+ deactivate: "Désactiver cet arrêt"
+ activate_confirm: "Etes vous sûr d'activer cet arrêt ?"
+ deactivate_confirm: "Etes vous sûr de désactiver cet arrêt ?"
deleted_at: "Activé"
destroy_confirm: "Etes vous sûr de supprimer cet arrêt ainsi que tous ses fils?"
select_parent: "Créer ou éditer la relation enfant -> parent"
diff --git a/config/routes.rb b/config/routes.rb
index a36ecc36e..e05f5d365 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,17 +86,19 @@ ChouetteIhm::Application.routes.draw do
resources :compliance_control_blocks, :except => [:show, :index]
end
+ deactivable = Proc.new do
+ put :deactivate, on: :member
+ put :activate, on: :member
+ end
+
resources :stop_area_referentials, :only => [:show] do
post :sync, on: :member
- resources :stop_areas
+ resources :stop_areas, &deactivable
end
resources :line_referentials, :only => [:show, :edit, :update] do
post :sync, on: :member
- resources :lines do
- put :deactivate, on: :member
- put :activate, on: :member
- end
+ resources :lines, &deactivable
resources :group_of_lines
resources :companies
resources :networks