From 0a69d409cded29a45ee3857f0a49c9a7a51d858a Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 8 Jan 2018 10:09:37 +0100 Subject: Fixes: #5413@1h; Specs implemented --- app/policies/access_point_policy.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/policies/access_point_policy.rb') diff --git a/app/policies/access_point_policy.rb b/app/policies/access_point_policy.rb index 41436e77c..469ed9739 100644 --- a/app/policies/access_point_policy.rb +++ b/app/policies/access_point_policy.rb @@ -6,14 +6,14 @@ class AccessPointPolicy < ApplicationPolicy end def create? - !archived? && organisation_match? && user.has_permission?('access_points.create') + !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.create') end def update? - !archived? && organisation_match? && user.has_permission?('access_points.update') + !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.update') end def destroy? - !archived? && organisation_match? && user.has_permission?('access_points.destroy') + !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.destroy') end end -- cgit v1.2.3 From 0e91d206fd8278d0c43c34777f4a585481882b70 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 9 Jan 2018 12:24:23 +0100 Subject: Refs: #5413@0.5h; Refactoring of #archived_or_finalised? --- app/policies/access_point_policy.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/policies/access_point_policy.rb') diff --git a/app/policies/access_point_policy.rb b/app/policies/access_point_policy.rb index 469ed9739..4fa887b9e 100644 --- a/app/policies/access_point_policy.rb +++ b/app/policies/access_point_policy.rb @@ -6,14 +6,14 @@ class AccessPointPolicy < ApplicationPolicy end def create? - !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.create') + !referential_read_only? && organisation_match? && user.has_permission?('access_points.create') end def update? - !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.update') + !referential_read_only? && organisation_match? && user.has_permission?('access_points.update') end def destroy? - !archived_or_finalised? && organisation_match? && user.has_permission?('access_points.destroy') + !referential_read_only? && organisation_match? && user.has_permission?('access_points.destroy') end end -- cgit v1.2.3