diff --git a/netbox/tenancy/forms/filtersets.py b/netbox/tenancy/forms/filtersets.py
index b08a33fa6c..7849e21716 100644
--- a/netbox/tenancy/forms/filtersets.py
+++ b/netbox/tenancy/forms/filtersets.py
@@ -22,8 +22,7 @@ class TenantGroupFilterForm(CustomFieldModelFilterForm):
parent_id = DynamicModelMultipleChoiceField(
queryset=TenantGroup.objects.all(),
required=False,
- label=_('Parent group'),
- fetch_trigger='open'
+ label=_('Parent group')
)
tag = TagFilterField(model)
@@ -38,8 +37,7 @@ class TenantFilterForm(CustomFieldModelFilterForm):
queryset=TenantGroup.objects.all(),
required=False,
null_option='None',
- label=_('Group'),
- fetch_trigger='open'
+ label=_('Group')
)
tag = TagFilterField(model)
@@ -53,8 +51,7 @@ class ContactGroupFilterForm(CustomFieldModelFilterForm):
parent_id = DynamicModelMultipleChoiceField(
queryset=ContactGroup.objects.all(),
required=False,
- label=_('Parent group'),
- fetch_trigger='open'
+ label=_('Parent group')
)
tag = TagFilterField(model)
@@ -74,7 +71,6 @@ class ContactFilterForm(CustomFieldModelFilterForm):
queryset=ContactGroup.objects.all(),
required=False,
null_option='None',
- label=_('Group'),
- fetch_trigger='open'
+ label=_('Group')
)
tag = TagFilterField(model)
diff --git a/netbox/tenancy/forms/forms.py b/netbox/tenancy/forms/forms.py
index cad63c1a6b..9a3d00e055 100644
--- a/netbox/tenancy/forms/forms.py
+++ b/netbox/tenancy/forms/forms.py
@@ -33,8 +33,7 @@ class TenancyFilterForm(forms.Form):
queryset=TenantGroup.objects.all(),
required=False,
null_option='None',
- label=_('Tenant group'),
- fetch_trigger='open'
+ label=_('Tenant group')
)
tenant_id = DynamicModelMultipleChoiceField(
queryset=Tenant.objects.all(),
@@ -43,6 +42,5 @@ class TenancyFilterForm(forms.Form):
query_params={
'group_id': '$tenant_group_id'
},
- label=_('Tenant'),
- fetch_trigger='open'
+ label=_('Tenant')
)
diff --git a/netbox/utilities/constants.py b/netbox/utilities/constants.py
index c3fbd0687c..08e9dd9cf7 100644
--- a/netbox/utilities/constants.py
+++ b/netbox/utilities/constants.py
@@ -57,6 +57,7 @@
'HTTP_HOST',
'HTTP_REFERER',
'HTTP_USER_AGENT',
+ 'HTTP_X_FORWARDED_FOR',
'QUERY_STRING',
'REMOTE_ADDR',
'REMOTE_HOST',
diff --git a/netbox/utilities/forms/fields.py b/netbox/utilities/forms/fields.py
index 007215b6e5..897dbc1742 100644
--- a/netbox/utilities/forms/fields.py
+++ b/netbox/utilities/forms/fields.py
@@ -399,8 +399,8 @@ class DynamicModelChoiceMixin:
filter = django_filters.ModelChoiceFilter
widget = widgets.APISelect
- def __init__(self, query_params=None, initial_params=None, null_option=None, disabled_indicator=None, fetch_trigger=None,
- empty_label=None, *args, **kwargs):
+ def __init__(self, query_params=None, initial_params=None, null_option=None, disabled_indicator=None,
+ fetch_trigger=None, empty_label=None, *args, **kwargs):
self.query_params = query_params or {}
self.initial_params = initial_params or {}
self.null_option = null_option
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 8f5692de93..183d640232 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -12,7 +12,7 @@
from django_tables2.utils import Accessor
from extras.choices import CustomFieldTypeChoices
-from extras.models import CustomField
+from extras.models import CustomField, CustomLink
from .utils import content_type_identifier, content_type_name
from .paginator import EnhancedPaginator, get_paginate_count
@@ -34,15 +34,18 @@ class Meta:
}
def __init__(self, *args, user=None, extra_columns=None, **kwargs):
+ if extra_columns is None:
+ extra_columns = []
+
# Add custom field columns
obj_type = ContentType.objects.get_for_model(self._meta.model)
cf_columns = [
(f'cf_{cf.name}', CustomFieldColumn(cf)) for cf in CustomField.objects.filter(content_types=obj_type)
]
- if extra_columns is not None:
- extra_columns.extend(cf_columns)
- else:
- extra_columns = cf_columns
+ cl_columns = [
+ (f'cl_{cl.name}', CustomLinkColumn(cl)) for cl in CustomLink.objects.filter(content_type=obj_type)
+ ]
+ extra_columns.extend([*cf_columns, *cl_columns])
super().__init__(*args, extra_columns=extra_columns, **kwargs)
@@ -208,7 +211,6 @@ class ButtonsColumn(tables.TemplateColumn):
:param model: Model class to use for calculating URL view names
:param prepend_content: Additional template content to render in the column (optional)
- :param return_url_extra: String to append to the return URL (e.g. for specifying a tab) (optional)
"""
buttons = ('changelog', 'edit', 'delete')
attrs = {'td': {'class': 'text-end text-nowrap noprint'}}
@@ -220,18 +222,18 @@ class ButtonsColumn(tables.TemplateColumn):
{{% endif %}}
{{% if "edit" in buttons and perms.{app_label}.change_{model_name} %}}
-
+
{{% endif %}}
{{% if "delete" in buttons and perms.{app_label}.delete_{model_name} %}}
-
+
{{% endif %}}
"""
- def __init__(self, model, *args, buttons=None, prepend_template=None, return_url_extra='', **kwargs):
+ def __init__(self, model, *args, buttons=None, prepend_template=None, **kwargs):
if prepend_template:
prepend_template = prepend_template.replace('{', '{{')
prepend_template = prepend_template.replace('}', '}}')
@@ -251,7 +253,6 @@ def __init__(self, model, *args, buttons=None, prepend_template=None, return_url
self.extra_context.update({
'buttons': buttons or self.buttons,
- 'return_url_extra': return_url_extra,
})
def header(self):
@@ -420,6 +421,37 @@ def render(self, value):
return self.default
+class CustomLinkColumn(tables.Column):
+ """
+ Render a custom links as a table column.
+ """
+ def __init__(self, customlink, *args, **kwargs):
+ self.customlink = customlink
+ kwargs['accessor'] = Accessor('pk')
+ if 'verbose_name' not in kwargs:
+ kwargs['verbose_name'] = customlink.name
+
+ super().__init__(*args, **kwargs)
+
+ def render(self, record):
+ try:
+ rendered = self.customlink.render({'obj': record})
+ if rendered:
+ return mark_safe(f'
{rendered["text"]}')
+ except Exception as e:
+ return mark_safe(f'
Error')
+ return ''
+
+ def value(self, record):
+ try:
+ rendered = self.customlink.render({'obj': record})
+ if rendered:
+ return rendered['link']
+ except Exception:
+ pass
+ return None
+
+
class MPTTColumn(tables.TemplateColumn):
"""
Display a nested hierarchy for MPTT-enabled models.
diff --git a/netbox/templates/utilities/render_custom_fields.html b/netbox/utilities/templates/form_helpers/render_custom_fields.html
similarity index 100%
rename from netbox/templates/utilities/render_custom_fields.html
rename to netbox/utilities/templates/form_helpers/render_custom_fields.html
diff --git a/netbox/templates/utilities/render_errors.html b/netbox/utilities/templates/form_helpers/render_errors.html
similarity index 100%
rename from netbox/templates/utilities/render_errors.html
rename to netbox/utilities/templates/form_helpers/render_errors.html
diff --git a/netbox/templates/utilities/render_field.html b/netbox/utilities/templates/form_helpers/render_field.html
similarity index 100%
rename from netbox/templates/utilities/render_field.html
rename to netbox/utilities/templates/form_helpers/render_field.html
diff --git a/netbox/templates/utilities/render_form.html b/netbox/utilities/templates/form_helpers/render_form.html
similarity index 100%
rename from netbox/templates/utilities/render_form.html
rename to netbox/utilities/templates/form_helpers/render_form.html
diff --git a/netbox/templates/utilities/templatetags/applied_filters.html b/netbox/utilities/templates/helpers/applied_filters.html
similarity index 100%
rename from netbox/templates/utilities/templatetags/applied_filters.html
rename to netbox/utilities/templates/helpers/applied_filters.html
diff --git a/netbox/templates/utilities/templatetags/badge.html b/netbox/utilities/templates/helpers/badge.html
similarity index 100%
rename from netbox/templates/utilities/templatetags/badge.html
rename to netbox/utilities/templates/helpers/badge.html
diff --git a/netbox/utilities/templates/helpers/checkmark.html b/netbox/utilities/templates/helpers/checkmark.html
new file mode 100644
index 0000000000..e4eacae016
--- /dev/null
+++ b/netbox/utilities/templates/helpers/checkmark.html
@@ -0,0 +1,5 @@
+{% if value %}
+
+{% elif show_false %}
+
+{% endif %}
diff --git a/netbox/templates/utilities/templatetags/table_config_form.html b/netbox/utilities/templates/helpers/table_config_form.html
similarity index 100%
rename from netbox/templates/utilities/templatetags/table_config_form.html
rename to netbox/utilities/templates/helpers/table_config_form.html
diff --git a/netbox/templates/utilities/templatetags/tag.html b/netbox/utilities/templates/helpers/tag.html
similarity index 100%
rename from netbox/templates/utilities/templatetags/tag.html
rename to netbox/utilities/templates/helpers/tag.html
diff --git a/netbox/templates/utilities/templatetags/utilization_graph.html b/netbox/utilities/templates/helpers/utilization_graph.html
similarity index 100%
rename from netbox/templates/utilities/templatetags/utilization_graph.html
rename to netbox/utilities/templates/helpers/utilization_graph.html
diff --git a/netbox/utilities/templates/navigation/nav_items.html b/netbox/utilities/templates/navigation/menu.html
similarity index 100%
rename from netbox/utilities/templates/navigation/nav_items.html
rename to netbox/utilities/templates/navigation/menu.html
diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py
index 808b24b4d9..03cc0ac0b0 100644
--- a/netbox/utilities/templatetags/form_helpers.py
+++ b/netbox/utilities/templatetags/form_helpers.py
@@ -4,6 +4,10 @@
register = template.Library()
+#
+# Filters
+#
+
@register.filter()
def getfield(form, fieldname):
"""
@@ -12,7 +16,24 @@ def getfield(form, fieldname):
return form[fieldname]
-@register.inclusion_tag('utilities/render_field.html')
+@register.filter(name='widget_type')
+def widget_type(field):
+ """
+ Return the widget type
+ """
+ if hasattr(field, 'widget'):
+ return field.widget.__class__.__name__.lower()
+ elif hasattr(field, 'field'):
+ return field.field.widget.__class__.__name__.lower()
+ else:
+ return None
+
+
+#
+# Inclusion tags
+#
+
+@register.inclusion_tag('form_helpers/render_field.html')
def render_field(field, bulk_nullable=False, label=None):
"""
Render a single form field from template
@@ -24,7 +45,7 @@ def render_field(field, bulk_nullable=False, label=None):
}
-@register.inclusion_tag('utilities/render_custom_fields.html')
+@register.inclusion_tag('form_helpers/render_custom_fields.html')
def render_custom_fields(form):
"""
Render all custom fields in a form
@@ -34,7 +55,7 @@ def render_custom_fields(form):
}
-@register.inclusion_tag('utilities/render_form.html')
+@register.inclusion_tag('form_helpers/render_form.html')
def render_form(form):
"""
Render an entire form from template
@@ -44,20 +65,7 @@ def render_form(form):
}
-@register.filter(name='widget_type')
-def widget_type(field):
- """
- Return the widget type
- """
- if hasattr(field, 'widget'):
- return field.widget.__class__.__name__.lower()
- elif hasattr(field, 'field'):
- return field.field.widget.__class__.__name__.lower()
- else:
- return None
-
-
-@register.inclusion_tag('utilities/render_errors.html')
+@register.inclusion_tag('form_helpers/render_errors.html')
def render_errors(form):
"""
Render form errors, if they exist.
diff --git a/netbox/utilities/templatetags/get_status.py b/netbox/utilities/templatetags/get_status.py
deleted file mode 100644
index fde6770535..0000000000
--- a/netbox/utilities/templatetags/get_status.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from django import template
-
-register = template.Library()
-
-TERMS_DANGER = ("delete", "deleted", "remove", "removed")
-TERMS_WARNING = ("changed", "updated", "change", "update")
-TERMS_SUCCESS = ("created", "added", "create", "add")
-
-
-@register.simple_tag
-def get_status(text: str) -> str:
- lower = text.lower()
-
- if lower in TERMS_DANGER:
- return "danger"
- elif lower in TERMS_WARNING:
- return "warning"
- elif lower in TERMS_SUCCESS:
- return "success"
- else:
- return "info"
diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py
index db9c40fc5a..0e45cb581c 100644
--- a/netbox/utilities/templatetags/helpers.py
+++ b/netbox/utilities/templatetags/helpers.py
@@ -59,6 +59,10 @@ def render_markdown(value):
# Render Markdown
html = markdown(value, extensions=['fenced_code', 'tables', StrikethroughExtension()])
+ # If the string is not empty wrap it in rendered-markdown to style tables
+ if html:
+ html = f'
{html}
'
+
return mark_safe(html)
@@ -380,7 +384,7 @@ def querystring(request, **kwargs):
return ''
-@register.inclusion_tag('utilities/templatetags/utilization_graph.html')
+@register.inclusion_tag('helpers/utilization_graph.html')
def utilization_graph(utilization, warning_threshold=75, danger_threshold=90):
"""
Display a horizontal bar graph indicating a percentage of utilization.
@@ -399,7 +403,7 @@ def utilization_graph(utilization, warning_threshold=75, danger_threshold=90):
}
-@register.inclusion_tag('utilities/templatetags/tag.html')
+@register.inclusion_tag('helpers/tag.html')
def tag(tag, url_name=None):
"""
Display a tag, optionally linked to a filtered list of objects.
@@ -410,7 +414,7 @@ def tag(tag, url_name=None):
}
-@register.inclusion_tag('utilities/templatetags/badge.html')
+@register.inclusion_tag('helpers/badge.html')
def badge(value, bg_class='secondary', show_empty=False):
"""
Display the specified number as a badge.
@@ -422,7 +426,24 @@ def badge(value, bg_class='secondary', show_empty=False):
}
-@register.inclusion_tag('utilities/templatetags/table_config_form.html')
+@register.inclusion_tag('helpers/checkmark.html')
+def checkmark(value, show_false=True, true='Yes', false='No'):
+ """
+ Display either a green checkmark or red X to indicate a boolean value.
+
+ :param show_false: Display a red X if the value is False
+ :param true: Text label for true value
+ :param false: Text label for false value
+ """
+ return {
+ 'value': bool(value),
+ 'show_false': show_false,
+ 'true_label': true,
+ 'false_label': false,
+ }
+
+
+@register.inclusion_tag('helpers/table_config_form.html')
def table_config_form(table, table_name=None):
return {
'table_name': table_name or table.__class__.__name__,
@@ -430,7 +451,7 @@ def table_config_form(table, table_name=None):
}
-@register.inclusion_tag('utilities/templatetags/applied_filters.html')
+@register.inclusion_tag('helpers/applied_filters.html')
def applied_filters(form, query_params):
"""
Display the active filters for a given filter form.
diff --git a/netbox/utilities/templatetags/nav.py b/netbox/utilities/templatetags/navigation.py
similarity index 81%
rename from netbox/utilities/templatetags/nav.py
rename to netbox/utilities/templatetags/navigation.py
index 205d1b590d..ede8792fac 100644
--- a/netbox/utilities/templatetags/nav.py
+++ b/netbox/utilities/templatetags/navigation.py
@@ -8,7 +8,7 @@
register = template.Library()
-@register.inclusion_tag("navigation/nav_items.html", takes_context=True)
+@register.inclusion_tag("navigation/menu.html", takes_context=True)
def nav(context: Context) -> Dict:
"""
Render the navigation menu.
diff --git a/netbox/utilities/templatetags/search_options.py b/netbox/utilities/templatetags/search.py
similarity index 100%
rename from netbox/utilities/templatetags/search_options.py
rename to netbox/utilities/templatetags/search.py
diff --git a/netbox/utilities/utils.py b/netbox/utilities/utils.py
index 3234135fbd..ce1f6a111d 100644
--- a/netbox/utilities/utils.py
+++ b/netbox/utilities/utils.py
@@ -288,45 +288,6 @@ def flatten_dict(d, prefix='', separator='.'):
return ret
-def decode_dict(encoded_dict: Dict, *, decode_keys: bool = True) -> Dict:
- """
- Recursively URL decode string keys and values of a dict.
-
- For example, `{'1%2F1%2F1': {'1%2F1%2F2': ['1%2F1%2F3', '1%2F1%2F4']}}` would
- become: `{'1/1/1': {'1/1/2': ['1/1/3', '1/1/4']}}`
-
- :param encoded_dict: Dictionary to be decoded.
- :param decode_keys: (Optional) Enable/disable decoding of dict keys.
- """
-
- def decode_value(value: Any, _decode_keys: bool) -> Any:
- """
- Handle URL decoding of any supported value type.
- """
- # Decode string values.
- if isinstance(value, str):
- return urllib.parse.unquote(value)
- # Recursively decode each list item.
- elif isinstance(value, list):
- return [decode_value(v, _decode_keys) for v in value]
- # Recursively decode each tuple item.
- elif isinstance(value, Tuple):
- return tuple(decode_value(v, _decode_keys) for v in value)
- # Recursively decode each dict key/value pair.
- elif isinstance(value, dict):
- # Don't decode keys, if `decode_keys` is false.
- if not _decode_keys:
- return {k: decode_value(v, _decode_keys) for k, v in value.items()}
- return {urllib.parse.unquote(k): decode_value(v, _decode_keys) for k, v in value.items()}
- return value
-
- if not decode_keys:
- # Don't decode keys, if `decode_keys` is false.
- return {k: decode_value(v, decode_keys) for k, v in encoded_dict.items()}
-
- return {urllib.parse.unquote(k): decode_value(v, decode_keys) for k, v in encoded_dict.items()}
-
-
def array_to_string(array):
"""
Generate an efficient, human-friendly string from a set of integers. Intended for use with ArrayField.
diff --git a/netbox/virtualization/forms/filtersets.py b/netbox/virtualization/forms/filtersets.py
index 2980e97dea..9ca8eba6e1 100644
--- a/netbox/virtualization/forms/filtersets.py
+++ b/netbox/virtualization/forms/filtersets.py
@@ -40,20 +40,17 @@ class ClusterFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
type_id = DynamicModelMultipleChoiceField(
queryset=ClusterType.objects.all(),
required=False,
- label=_('Type'),
- fetch_trigger='open'
+ label=_('Type')
)
region_id = DynamicModelMultipleChoiceField(
queryset=Region.objects.all(),
required=False,
- label=_('Region'),
- fetch_trigger='open'
+ label=_('Region')
)
site_group_id = DynamicModelMultipleChoiceField(
queryset=SiteGroup.objects.all(),
required=False,
- label=_('Site group'),
- fetch_trigger='open'
+ label=_('Site group')
)
site_id = DynamicModelMultipleChoiceField(
queryset=Site.objects.all(),
@@ -63,15 +60,13 @@ class ClusterFilterForm(TenancyFilterForm, CustomFieldModelFilterForm):
'region_id': '$region_id',
'site_group_id': '$site_group_id',
},
- label=_('Site'),
- fetch_trigger='open'
+ label=_('Site')
)
group_id = DynamicModelMultipleChoiceField(
queryset=ClusterGroup.objects.all(),
required=False,
null_option='None',
- label=_('Group'),
- fetch_trigger='open'
+ label=_('Group')
)
tag = TagFilterField(model)
@@ -89,33 +84,28 @@ class VirtualMachineFilterForm(LocalConfigContextFilterForm, TenancyFilterForm,
queryset=ClusterGroup.objects.all(),
required=False,
null_option='None',
- label=_('Cluster group'),
- fetch_trigger='open'
+ label=_('Cluster group')
)
cluster_type_id = DynamicModelMultipleChoiceField(
queryset=ClusterType.objects.all(),
required=False,
null_option='None',
- label=_('Cluster type'),
- fetch_trigger='open'
+ label=_('Cluster type')
)
cluster_id = DynamicModelMultipleChoiceField(
queryset=Cluster.objects.all(),
required=False,
- label=_('Cluster'),
- fetch_trigger='open'
+ label=_('Cluster')
)
region_id = DynamicModelMultipleChoiceField(
queryset=Region.objects.all(),
required=False,
- label=_('Region'),
- fetch_trigger='open'
+ label=_('Region')
)
site_group_id = DynamicModelMultipleChoiceField(
queryset=SiteGroup.objects.all(),
required=False,
- label=_('Site group'),
- fetch_trigger='open'
+ label=_('Site group')
)
site_id = DynamicModelMultipleChoiceField(
queryset=Site.objects.all(),
@@ -125,8 +115,7 @@ class VirtualMachineFilterForm(LocalConfigContextFilterForm, TenancyFilterForm,
'region_id': '$region_id',
'group_id': '$site_group_id',
},
- label=_('Site'),
- fetch_trigger='open'
+ label=_('Site')
)
role_id = DynamicModelMultipleChoiceField(
queryset=DeviceRole.objects.all(),
@@ -135,8 +124,7 @@ class VirtualMachineFilterForm(LocalConfigContextFilterForm, TenancyFilterForm,
query_params={
'vm_role': "True"
},
- label=_('Role'),
- fetch_trigger='open'
+ label=_('Role')
)
status = forms.MultipleChoiceField(
choices=VirtualMachineStatusChoices,
@@ -147,8 +135,7 @@ class VirtualMachineFilterForm(LocalConfigContextFilterForm, TenancyFilterForm,
queryset=Platform.objects.all(),
required=False,
null_option='None',
- label=_('Platform'),
- fetch_trigger='open'
+ label=_('Platform')
)
mac_address = forms.CharField(
required=False,
@@ -174,8 +161,7 @@ class VMInterfaceFilterForm(CustomFieldModelFilterForm):
cluster_id = DynamicModelMultipleChoiceField(
queryset=Cluster.objects.all(),
required=False,
- label=_('Cluster'),
- fetch_trigger='open'
+ label=_('Cluster')
)
virtual_machine_id = DynamicModelMultipleChoiceField(
queryset=VirtualMachine.objects.all(),
@@ -183,8 +169,7 @@ class VMInterfaceFilterForm(CustomFieldModelFilterForm):
query_params={
'cluster_id': '$cluster_id'
},
- label=_('Virtual machine'),
- fetch_trigger='open'
+ label=_('Virtual machine')
)
enabled = forms.NullBooleanField(
required=False,
diff --git a/netbox/wireless/api/serializers.py b/netbox/wireless/api/serializers.py
index 68e8181f1c..f1fa6d58d3 100644
--- a/netbox/wireless/api/serializers.py
+++ b/netbox/wireless/api/serializers.py
@@ -40,6 +40,7 @@ class Meta:
model = WirelessLAN
fields = [
'id', 'url', 'display', 'ssid', 'description', 'group', 'vlan', 'auth_type', 'auth_cipher', 'auth_psk',
+ 'description', 'tags', 'custom_fields', 'created', 'last_updated',
]
@@ -55,5 +56,5 @@ class Meta:
model = WirelessLink
fields = [
'id', 'url', 'display', 'interface_a', 'interface_b', 'ssid', 'status', 'description', 'auth_type',
- 'auth_cipher', 'auth_psk',
+ 'auth_cipher', 'auth_psk', 'description', 'tags', 'custom_fields', 'created', 'last_updated',
]
diff --git a/netbox/wireless/forms/filtersets.py b/netbox/wireless/forms/filtersets.py
index b94332bd7f..82df93e6c8 100644
--- a/netbox/wireless/forms/filtersets.py
+++ b/netbox/wireless/forms/filtersets.py
@@ -19,8 +19,7 @@ class WirelessLANGroupFilterForm(CustomFieldModelFilterForm):
parent_id = DynamicModelMultipleChoiceField(
queryset=WirelessLANGroup.objects.all(),
required=False,
- label=_('Parent group'),
- fetch_trigger='open'
+ label=_('Parent group')
)
tag = TagFilterField(model)
@@ -39,8 +38,7 @@ class WirelessLANFilterForm(CustomFieldModelFilterForm):
queryset=WirelessLANGroup.objects.all(),
required=False,
null_option='None',
- label=_('Group'),
- fetch_trigger='open'
+ label=_('Group')
)
auth_type = forms.ChoiceField(
required=False,
diff --git a/requirements.txt b/requirements.txt
index 4051862d10..5a4a4fa263 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ django-graphiql-debug-toolbar==0.2.0
django-mptt==0.13.4
django-pglocks==1.0.4
django-prometheus==2.2.0
-django-redis==5.1.0
+django-redis==5.2.0
django-rq==2.5.1
django-tables2==2.4.1
django-taggit==2.0.0
@@ -21,7 +21,7 @@ markdown-include==0.6.0
mkdocs-material==8.1.3
netaddr==0.8.0
Pillow==8.4.0
-psycopg2-binary==2.9.2
+psycopg2-binary==2.9.3
PyYAML==6.0
social-auth-app-django==5.0.0
social-auth-core==4.1.0