From 8d84eec3e19f0d6af4dcabb87bf633c1b09bccd8 Mon Sep 17 00:00:00 2001 From: Arthur Date: Fri, 14 Jul 2023 12:43:47 +0700 Subject: [PATCH] 12589 review changes - change permission check --- netbox/utilities/permissions.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py index 36b2295f2..6bdf2b9c4 100644 --- a/netbox/utilities/permissions.py +++ b/netbox/utilities/permissions.py @@ -75,14 +75,17 @@ def permission_is_exempt(name): if action == 'view': if ( - # All models (excluding those in EXEMPT_EXCLUDE_MODELS) are exempt from view permission enforcement - '*' in settings.EXEMPT_VIEW_PERMISSIONS and (f'{app_label}.{model_name}' in settings.EXEMPT_VIEW_PERMISSIONS or (app_label, model_name) not in settings.EXEMPT_EXCLUDE_MODELS) - ) or ( # This specific model is exempt from view permission enforcement f'{app_label}.{model_name}' in settings.EXEMPT_VIEW_PERMISSIONS ): return True + if ( + # All models (excluding those in EXEMPT_EXCLUDE_MODELS) are exempt from view permission enforcement + '*' in settings.EXEMPT_VIEW_PERMISSIONS and ((app_label, model_name) not in settings.EXEMPT_EXCLUDE_MODELS) + ): + return True + return False