From c4f44f7558c56254cdd14a124b33acd46df7f69f Mon Sep 17 00:00:00 2001 From: Fredrik Strand Oseberg Date: Tue, 4 May 2021 21:25:35 +0200 Subject: [PATCH] fix: allow permissions to be checked without project being defined (#282) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: allow permissions to be checked without project being defined * fix: change order Co-authored-by: Ivar Conradi Ă˜sthus --- frontend/src/component/AccessProvider/AccessProvider.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frontend/src/component/AccessProvider/AccessProvider.tsx b/frontend/src/component/AccessProvider/AccessProvider.tsx index a5a7b6b9c0..53fedb6d23 100644 --- a/frontend/src/component/AccessProvider/AccessProvider.tsx +++ b/frontend/src/component/AccessProvider/AccessProvider.tsx @@ -21,9 +21,15 @@ const AccessProvider: FC = ({ store, children }) => { if (p.permission === ADMIN) { return true; } + if (p.permission === permission && p.project === project) { return true; } + + if (p.permission === permission && project === undefined) { + return true; + } + return false; });