Merge branch 'master' into 4466-compliance_check_sets

2 files changed, 18 insertions, 3 deletions

diff --git a/app/policies/compliance_control_policy.rb b/app/policies/compliance_control_policy.rb
index fbea366f5..09250f013 100644
--- a/app/policies/compliance_control_policy.rb
+++ b/app/policies/compliance_control_policy.rb
@@ -6,14 +6,17 @@ class ComplianceControlPolicy < ApplicationPolicy
   end
 
   def destroy?
-    user.has_permission?('compliance_controls.destroy')
+    # user.has_permission?('compliance_controls.destroy')
+    true
   end
 
   def create?
-    user.has_permission?('compliance_controls.create')
+    # user.has_permission?('compliance_controls.create')
+    true
   end
 
   def update?
-    user.has_permission?('compliance_controls.update')
+    # user.has_permission?('compliance_controls.update')
+    true
   end
 end
diff --git a/app/policies/import_policy.rb b/app/policies/import_policy.rb
index 9e1d99a66..b12dcc167 100644
--- a/app/policies/import_policy.rb
+++ b/app/policies/import_policy.rb
@@ -4,4 +4,16 @@ class ImportPolicy < ApplicationPolicy
       scope
     end
   end
+
+  def create?
+    !archived? && user.has_permission?('imports.create')
+  end
+
+  def destroy?
+    !archived? && user.has_permission?('imports.destroy')
+  end
+
+  def update?
+    !archived? && user.has_permission?('imports.update')
+  end
 end