Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes: #14840 - Forces API to use django user model instead of proxy model #14881

Merged
merged 8 commits into from
Feb 5, 2024
Merged

Fixes: #14840 - Forces API to use django user model instead of proxy model #14881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df85cc9
Fixes: #14840 - Forces API to use proxy model
DanSheps Jan 20, 2024
1d784cf
Update tests to use proxy model
DanSheps Jan 22, 2024
773daed
Revert "Update tests to use proxy model"
DanSheps Jan 24, 2024
3ab8caa
Revert "Fixes: #14840 - Forces API to use proxy model"
DanSheps Jan 24, 2024
15df808
More realistic change to resole issue with netboxusers-list
DanSheps Jan 24, 2024
979b714
Revert "More realistic change to resole issue with netboxusers-list"
DanSheps Jan 26, 2024
8be1f9d
Fixes: #14840 - Better fix for netboxusers-list
DanSheps Jan 26, 2024
1990a9c
Swap model for serializer from proxy model
DanSheps Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions netbox/utilities/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ def get_serializer_for_model(model, prefix=''):
# Serializers for Django's auth models are in the users app
if app_name == 'auth':
app_name = 'users'
# Account for changes using Proxy model
if app_name == 'users':
if model_name == 'NetBoxUser':
model_name = 'User'
elif model_name == 'NetBoxGroup':
model_name = 'Group'

serializer_name = f'{app_name}.api.serializers.{prefix}{model_name}Serializer'
try:
return dynamic_import(serializer_name)
Expand Down
2 changes: 2 additions & 0 deletions netbox/utilities/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ def get_viewname(model, action=None, rest_api=False):
# Alter the app_label for group and user model_name to point to users app
if app_label == 'auth' and model_name in ['group', 'user']:
app_label = 'users'
if app_label == 'users' and model._meta.proxy and model_name in ['netboxuser', 'netboxgroup']:
model_name = model._meta.proxy_for_model._meta.model_name

viewname = f'{app_label}-api:{model_name}'
# Append the action, if any
Expand Down
Loading