diff options
| author | teddywing | 2017-10-19 17:05:12 +0200 |
|---|---|---|
| committer | GitHub | 2017-10-19 17:05:12 +0200 |
| commit | 3ee97da2ff5c782debcce2ab7365110c95471942 (patch) | |
| tree | 0fae2845185c36936f54ec3603c051563bd3364f /config | |
| parent | 86122f091fc58cccaa882e1d76368730f16d30da (diff) | |
| parent | aba7a66a6baf07b38e346caf05ae5606804d2976 (diff) | |
| download | chouette-core-3ee97da2ff5c782debcce2ab7365110c95471942.tar.bz2 | |
Merge pull request #97 from af83/4741-clone_compliance_control_set
add clone method in compliance_control_sets_controller, add duplicate…
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/compliance_control_sets.en.yml | 2 | ||||
| -rw-r--r-- | config/locales/compliance_control_sets.fr.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/config/locales/compliance_control_sets.en.yml b/config/locales/compliance_control_sets.en.yml index 34f25e1e1..ed7ccad5e 100644 --- a/config/locales/compliance_control_sets.en.yml +++ b/config/locales/compliance_control_sets.en.yml @@ -2,6 +2,8 @@ en: compliance_control_sets: clone: prefix: 'Copie de' + errors: + operation_in_progress: "The clone operation is in progress. Please wait and refresh the page in a few moments" index: title: Compliance control set new: New compliance control set diff --git a/config/locales/compliance_control_sets.fr.yml b/config/locales/compliance_control_sets.fr.yml index 83be7da2b..d952567bf 100644 --- a/config/locales/compliance_control_sets.fr.yml +++ b/config/locales/compliance_control_sets.fr.yml @@ -2,6 +2,8 @@ fr: compliance_control_sets: clone: prefix: 'Copy of' + errors: + operation_in_progress: "L'opération de clone est en cours. Veuillez patienter et raffraichir la page dans quelques instants" index: title: "Liste des jeux de contrôles" edit: diff --git a/config/routes.rb b/config/routes.rb index b9e318f91..b105e77d6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,6 +74,7 @@ ChouetteIhm::Application.routes.draw do resources :api_keys, :only => [:edit, :update, :new, :create, :destroy] resources :compliance_control_sets do + get :clone, on: :member resources :compliance_controls, except: :index do get :select_type, on: :collection end |