aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorteddywing2017-10-19 17:05:12 +0200
committerGitHub2017-10-19 17:05:12 +0200
commit3ee97da2ff5c782debcce2ab7365110c95471942 (patch)
tree0fae2845185c36936f54ec3603c051563bd3364f
parent86122f091fc58cccaa882e1d76368730f16d30da (diff)
parentaba7a66a6baf07b38e346caf05ae5606804d2976 (diff)
downloadchouette-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…
-rw-r--r--app/controllers/compliance_control_sets_controller.rb8
-rw-r--r--app/decorators/compliance_control_set_decorator.rb7
-rw-r--r--config/locales/compliance_control_sets.en.yml2
-rw-r--r--config/locales/compliance_control_sets.fr.yml2
-rw-r--r--config/routes.rb1
5 files changed, 19 insertions, 1 deletions
diff --git a/app/controllers/compliance_control_sets_controller.rb b/app/controllers/compliance_control_sets_controller.rb
index 9de90c21c..e5c2e19dd 100644
--- a/app/controllers/compliance_control_sets_controller.rb
+++ b/app/controllers/compliance_control_sets_controller.rb
@@ -23,6 +23,12 @@ class ComplianceControlSetsController < BreadcrumbController
end
end
+ def clone
+ ComplianceControlSetCloner.new.copy(params[:id], current_organisation.id)
+ flash[:notice] = I18n.t("compliance_control_sets.errors.operation_in_progress")
+ redirect_to(compliance_control_sets_path)
+ end
+
protected
def begin_of_association_chain
@@ -48,4 +54,4 @@ class ComplianceControlSetsController < BreadcrumbController
def compliance_control_set_params
params.require(:compliance_control_set).permit(:name, :id)
end
-end
+end \ No newline at end of file
diff --git a/app/decorators/compliance_control_set_decorator.rb b/app/decorators/compliance_control_set_decorator.rb
index f4aa607e1..7515316ce 100644
--- a/app/decorators/compliance_control_set_decorator.rb
+++ b/app/decorators/compliance_control_set_decorator.rb
@@ -4,6 +4,13 @@ class ComplianceControlSetDecorator < Draper::Decorator
def action_links
links = []
+ # if policy.clone?
+ links << Link.new(
+ content: h.t('actions.clone'),
+ href: h.clone_compliance_control_set_path(object.id)
+ )
+ # end
+
# if h.policy(object).destroy?
links << Link.new(
content: h.destroy_link_content,
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