Merge branch '4467_compliance_control_crud' into 4466-compliance_control_sets

7 files changed, 24 insertions, 0 deletions

diff --git a/app/controllers/compliance_controls_controller.rb b/app/controllers/compliance_controls_controller.rb
new file mode 100644
index 000000000..d198f2cdb
--- /dev/null
+++ b/app/controllers/compliance_controls_controller.rb
@@ -0,0 +1,22 @@
+class ComplianceControlsController < BreadcrumbController
+  defaults resource_class: ComplianceControl
+  belongs_to :compliance_control_set
+
+  def create
+    create!(notice: t('notice.compliance_control.created'))
+  end
+
+  def update
+    path = compliance_control_set_compliance_control_path(parent, resource)
+    update!(notice: t('notice.compliance_control.updated')) { path }
+  end
+
+  def destroy
+    destroy!(notice: t('notice.compliance_control.destroyed'))
+  end
+
+  private
+  def compliance_control_params
+    params.require(:compliance_control).permit(:name, :code, :criticity, :comment, :control_attributes)
+  end
+end
diff --git a/app/models/compliance_control.rb b/app/models/compliance_control.rb
index 64556b524..685a00706 100644
--- a/app/models/compliance_control.rb
+++ b/app/models/compliance_control.rb
@@ -3,6 +3,7 @@ class ComplianceControl < ActiveRecord::Base
   belongs_to :compliance_control_block
 
   enum criticity: [:info, :warning, :error]
+
   validates :criticity, presence: true
   validates :name, presence: true
   validates :code, presence: true
diff --git a/app/models/compliance_control_set.rb b/app/models/compliance_control_set.rb
index 7801eb612..ca112531d 100644
--- a/app/models/compliance_control_set.rb
+++ b/app/models/compliance_control_set.rb
@@ -1,3 +1,4 @@
 class ComplianceControlSet < ActiveRecord::Base
   belongs_to :organisation
+  has_many :compliance_controls
 end
diff --git a/app/views/compliance_controls/edit.html.slim b/app/views/compliance_controls/edit.html.slim
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/compliance_controls/edit.html.slim
diff --git a/app/views/compliance_controls/index.html.slim b/app/views/compliance_controls/index.html.slim
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/compliance_controls/index.html.slim
diff --git a/app/views/compliance_controls/new.html.slim b/app/views/compliance_controls/new.html.slim
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/compliance_controls/new.html.slim
diff --git a/app/views/compliance_controls/show.html.slim b/app/views/compliance_controls/show.html.slim
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/app/views/compliance_controls/show.html.slim