From 5e6aab33a6b7dd22471cdb7d3bd7f64b9b571a33 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Mon, 26 Aug 2024 15:12:05 -0400 Subject: [PATCH] Simplify User object check by updating tokens instead of resolved values --- netbox/utilities/permissions.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/netbox/utilities/permissions.py b/netbox/utilities/permissions.py index 321d065cf..ba245dae1 100644 --- a/netbox/utilities/permissions.py +++ b/netbox/utilities/permissions.py @@ -93,12 +93,14 @@ def qs_filter_from_constraints(constraints, tokens=None): if tokens is None: tokens = {} + User = apps.get_model('users.User') + for token, value in tokens.items(): + if token == CONSTRAINT_TOKEN_USER and isinstance(value, User): + tokens[token] = value.id + def _replace_tokens(value, tokens): if type(value) is list: return list(map(lambda v: tokens.get(v, v), value)) - User = apps.get_model('users.User') - if value == CONSTRAINT_TOKEN_USER and isinstance(tokens.get(CONSTRAINT_TOKEN_USER), User): - return tokens[CONSTRAINT_TOKEN_USER].id return tokens.get(value, value) params = Q()