Refs #5325; Fix calendat policy

Remove the "!archived?" condition which makes no sense here.

2 files changed, 8 insertions, 8 deletions

diff --git a/app/policies/calendar_policy.rb b/app/policies/calendar_policy.rb
index 3ba708ec9..c2da8c924 100644
--- a/app/policies/calendar_policy.rb
+++ b/app/policies/calendar_policy.rb
@@ -6,7 +6,7 @@ class CalendarPolicy < ApplicationPolicy
   end
 
   def create?
-    !archived? && user.has_permission?('calendars.create')
+    user.has_permission?('calendars.create')
   end
   def destroy?; instance_permission("destroy") end
   def update?; instance_permission("update") end
@@ -14,6 +14,6 @@ class CalendarPolicy < ApplicationPolicy
 
   private
   def instance_permission permission
-    !archived? & organisation_match? && user.has_permission?("calendars.#{permission}")
+    organisation_match? && user.has_permission?("calendars.#{permission}")
   end
 end
diff --git a/spec/policies/calendar_policy_spec.rb b/spec/policies/calendar_policy_spec.rb
index 8b1facc71..5fd1eca47 100644
--- a/spec/policies/calendar_policy_spec.rb
+++ b/spec/policies/calendar_policy_spec.rb
@@ -5,21 +5,21 @@ RSpec.describe CalendarPolicy, type: :policy do
 
 
   permissions :create? do
-    it_behaves_like 'permitted policy', 'calendars.create', archived: true
+    it_behaves_like 'permitted policy', 'calendars.create'
   end
   permissions :share? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.share', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.share'
   end
   permissions :destroy? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.destroy', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.destroy'
   end
   permissions :edit? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.update', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.update'
   end
   permissions :new? do
-    it_behaves_like 'permitted policy', 'calendars.create', archived: true
+    it_behaves_like 'permitted policy', 'calendars.create'
   end
   permissions :update? do
-    it_behaves_like 'permitted policy and same organisation', 'calendars.update', archived: true
+    it_behaves_like 'permitted policy and same organisation', 'calendars.update'
   end
 end