Refs: #3478@1h;

   -  All permissions tied to `!archived?`
   -  Tests adapted
   -  Policies refactored

   ?  Is `create?` permission bound to `organisation_match?`

1 files changed, 3 insertions, 3 deletions

diff --git a/app/policies/vehicle_journey_policy.rb b/app/policies/vehicle_journey_policy.rb
index 7737f6d7e..27d96e43b 100644
--- a/app/policies/vehicle_journey_policy.rb
+++ b/app/policies/vehicle_journey_policy.rb
@@ -6,14 +6,14 @@ class VehicleJourneyPolicy < ApplicationPolicy
   end
 
   def create?
-    user.has_permission?('vehicle_journeys.create') # organisation match via referential is checked in the view
+    !archived? && organisation_match? && user.has_permission?('vehicle_journeys.create')
   end
 
   def destroy?
-    organisation_match? && user.has_permission?('vehicle_journeys.destroy')
+    !archived? && organisation_match? && user.has_permission?('vehicle_journeys.destroy')
   end
 
   def update?
-    organisation_match? && user.has_permission?('vehicle_journeys.edit')
+    !archived? && organisation_match? && user.has_permission?('vehicle_journeys.edit')
   end
 end