diff options
| author | Zog | 2017-12-20 12:58:20 +0100 | 
|---|---|---|
| committer | Alban Peignier | 2017-12-21 21:19:27 +0100 | 
| commit | 9a34cb48f49df574ae1e7c599713ed246e2938cf (patch) | |
| tree | 49c91cfdaa645f39363c3e8c492b86a0dde08c89 /config | |
| parent | 8cd9b9ee5fc127b2f39a9c89c71327ab8d5e9cec (diff) | |
| download | chouette-core-9a34cb48f49df574ae1e7c599713ed246e2938cf.tar.bz2 | |
Refs #5430 @2h; Deactivate lines instead of destroying them
- Add `activate` and `deactivate` actions in `LinesController`, as well
as corresponding routes
- Add `activate!` and `deactivate!` methods in `Chouette::Line`, as well
as `activated?`
- Add `activate?` and `deactivate?` permissions in `LinePolicy`
- Add corresponding `action_links`in the Decorator
- Create helper for these actions
- Add an optional `'extra_class` to the Links
- Update styles for ".delete-action" to handle the case where there are
several
- Add I18n keys accordingly
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/actions.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/actions.fr.yml | 2 | ||||
| -rw-r--r-- | config/locales/lines.en.yml | 8 | ||||
| -rw-r--r-- | config/locales/lines.fr.yml | 4 | ||||
| -rw-r--r-- | config/routes.rb | 5 | 
5 files changed, 18 insertions, 3 deletions
| diff --git a/config/locales/actions.en.yml b/config/locales/actions.en.yml index 2706ba69d..f5f48db22 100644 --- a/config/locales/actions.en.yml +++ b/config/locales/actions.en.yml @@ -1,6 +1,8 @@  en:    actions:      edit: "Edit" +    activate: 'Activate' +    deactivate: 'Deactivate'      destroy: "Destroy"      delete: "Delete"      search: "Search" diff --git a/config/locales/actions.fr.yml b/config/locales/actions.fr.yml index e796017c7..4b3ac6901 100644 --- a/config/locales/actions.fr.yml +++ b/config/locales/actions.fr.yml @@ -1,6 +1,8 @@  fr:    actions:      edit: 'Editer' +    activate: 'Activer' +    deactivate: 'Désactiver'      destroy: 'Supprimer'      delete: 'Supprimer'      search: "Chercher" diff --git a/config/locales/lines.en.yml b/config/locales/lines.en.yml index 78d5c36be..0bbe1b30d 100644 --- a/config/locales/lines.en.yml +++ b/config/locales/lines.en.yml @@ -6,8 +6,12 @@ en:        edit: "Edit this line"        edit_footnotes: "Edit line footnotes"        destroy: "Remove this line" -      destroy_confirm: "Are you sure you want destroy this line?" -      destroy_selection_confirm: "Are you sure you want destroy those lines?" +      activate: "Activate this line" +      deactivate: "Deactivate this line" +      activate_confirm: "Are you sure you want to activate this line ?" +      deactivate_confirm: "Are you sure you want tode activate this line ?" +      destroy_confirm: "Are you sure you want to destroy this line ?" +      destroy_selection_confirm: "Are you sure you want to destroy those lines ?"        import: "Import lines"        export_kml: "Export KML line"        export_kml_all: "Export KML lines" diff --git a/config/locales/lines.fr.yml b/config/locales/lines.fr.yml index 36254d754..9397f6989 100644 --- a/config/locales/lines.fr.yml +++ b/config/locales/lines.fr.yml @@ -6,6 +6,10 @@ fr:        edit: "Editer cette ligne"        edit_footnotes: "Editer notes en bas de page"        destroy: "Supprimer cette ligne" +      activate: "Activer cette ligne" +      deactivate: "Désactiver cette ligne" +      activate_confirm: "Etes vous sûr d'activer cette ligne ?" +      deactivate_confirm: "Etes vous sûr de désactiver cette ligne ?"        destroy_confirm: "Etes vous sûr de supprimer cette ligne ?"        destroy_selection_confirm: "Etes vous sûr de supprimer cette sélection de lignes ?"        import: "Importer des lignes" diff --git a/config/routes.rb b/config/routes.rb index d097d2d71..a36ecc36e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -93,7 +93,10 @@ ChouetteIhm::Application.routes.draw do    resources :line_referentials, :only => [:show, :edit, :update] do      post :sync, on: :member -    resources :lines +    resources :lines do +      put :deactivate, on: :member +      put :activate, on: :member +    end      resources :group_of_lines      resources :companies      resources :networks | 
