mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Added optional user and group on custom field (#12206)

Browse Source 
* added group and user model to object_type

* Update netbox/utilities/utils.py

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Abhimanyu Saharan
2023-04-10 22:10:13 +05:30
committed by GitHub
parent 278f2b173a
commit 2c07762b7a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/extras/forms/model_forms.py
View File

@ -1,6 +1,7 @@
import json import json
from django import forms from django import forms
from django.db.models import Q
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
@ -37,7 +38,7 @@ class CustomFieldForm(BootstrapMixin, forms.ModelForm):
object_type = ContentTypeChoiceField( object_type = ContentTypeChoiceField(
queryset=ContentType.objects.all(), queryset=ContentType.objects.all(),
# TODO: Come up with a canonical way to register suitable models # TODO: Come up with a canonical way to register suitable models
limit_choices_to=FeatureQuery('webhooks'), limit_choices_to=FeatureQuery('webhooks').get_query() | Q(app_label='auth', model__in=['user', 'group']),
required=False, required=False,
help_text=_("Type of the related object (for object/multi-object fields only)") help_text=_("Type of the related object (for object/multi-object fields only)")
) )

4
netbox/utilities/utils.py
View File

@ -48,6 +48,10 @@ def get_viewname(model, action=None, rest_api=False):
if is_plugin: if is_plugin:
viewname = f'plugins-api:{app_label}-api:{model_name}' viewname = f'plugins-api:{app_label}-api:{model_name}'
else: else:
# 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'
viewname = f'{app_label}-api:{model_name}' viewname = f'{app_label}-api:{model_name}'
# Append the action, if any # Append the action, if any
if action: if action: