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/application_policy.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/policies/application_policy.rb') diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index dbe4542e7..68007b133 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -76,11 +76,12 @@ class ApplicationPolicy # Custom Permissions # ------------------ - def archived? - return @is_archived if instance_variable_defined?(:@is_archived) - @is_archived = is_archived + def archived_or_finalised? + return @is_archived_or_finalised if instance_variable_defined?(:@is_archived_or_finalised) + @is_archived_or_finalised = is_archived_or_finalised end + def organisation_match? user.organisation_id == organisation_id end @@ -116,12 +117,12 @@ class ApplicationPolicy end private - def is_archived + def is_archived_or_finalised !!case referential when Referential - referential.archived_at + referential.archived_at || referential.in_referential_suite? else - current_referential.try(:archived_at) + current_referential.try(:archived_at) || current_referential.try(:in_referential_suite?) end end end -- cgit v1.2.3