Fixes: #17740 - Add webp to the list of acceptable extensions for handling filenames in image_upload

docs/customization/custom-scripts.md

@@ -72,6 +72,9 @@ script_order = (MyCustomScript, AnotherCustomScript)
 
 Script attributes are defined under a class named `Meta` within the script. These are optional, but encouraged.
 
+!!! warning
+    These are also defined and used as properties on the base custom script class, so don't use the same names as variables or override them in your custom script.
+
 ### `name`
 
 This is the human-friendly names of your script. If omitted, the class name will be used.

netbox/dcim/graphql/types.py

@@ -112,7 +112,7 @@ class ModularComponentTemplateType(ComponentTemplateType):
 
 @strawberry_django.type(
     models.CableTermination,
-    exclude=('termination_type', 'termination_id'),
+    exclude=('termination_type', 'termination_id', '_device', '_rack', '_location', '_site'),
     filters=CableTerminationFilter
 )
 class CableTerminationType(NetBoxObjectType):
@@ -243,6 +243,7 @@ class DeviceType(ConfigContextMixin, ImageAttachmentsMixin, ContactsMixin, NetBo
     consoleserverports: List[Annotated["ConsoleServerPortType", strawberry.lazy('dcim.graphql.types')]]
     poweroutlets: List[Annotated["PowerOutletType", strawberry.lazy('dcim.graphql.types')]]
     frontports: List[Annotated["FrontPortType", strawberry.lazy('dcim.graphql.types')]]
+    devicebays: List[Annotated["DeviceBayType", strawberry.lazy('dcim.graphql.types')]]
     modulebays: List[Annotated["ModuleBayType", strawberry.lazy('dcim.graphql.types')]]
     services: List[Annotated["ServiceType", strawberry.lazy('ipam.graphql.types')]]
     inventoryitems: List[Annotated["InventoryItemType", strawberry.lazy('dcim.graphql.types')]]

netbox/extras/utils.py

@@ -33,7 +33,7 @@ def image_upload(instance, filename):
 
     # Rename the file to the provided name, if any. Attempt to preserve the file extension.
     extension = filename.rsplit('.')[-1].lower()
-    if instance.name and extension in ['bmp', 'gif', 'jpeg', 'jpg', 'png']:
+    if instance.name and extension in ['bmp', 'gif', 'jpeg', 'jpg', 'png', 'webp']:
         filename = '.'.join([instance.name, extension])
     elif instance.name:
         filename = instance.name

netbox/netbox/jobs.py

@@ -68,6 +68,8 @@ def handle(cls, job, *args, **kwargs):
         finally:
             if job.interval:
                 new_scheduled_time = (job.scheduled or job.started) + timedelta(minutes=job.interval)
+                if job.object and getattr(job.object, "python_class", None):
+                    kwargs["job_timeout"] = job.object.python_class.job_timeout
                 cls.enqueue(
                     instance=job.object,
                     user=job.user,

netbox/templates/core/plugin.html

@@ -2,6 +2,7 @@
 {% load helpers %}
 {% load form_helpers %}
 {% load i18n %}
+{% load render_table from django_tables2 %}
 
 {% block title %}{{ plugin.title_long }}{% endblock %}
 
@@ -93,8 +94,8 @@ <h2 class="card-header">{% trans "Plugin Details" %}</h2>
       <div class="col col-6">
         <div class="card">
           <h2 class="card-header">{% trans "Version History" %}</h2>
-          <div class="htmx-container table-responsive" id="object_list">
-            {% include 'htmx/table.html' %}
+          <div class="table-responsive">
+            {% render_table table 'inc/table.html' %}
           </div>
         </div>
       </div>

netbox/tenancy/graphql/types.py

@@ -66,6 +66,7 @@ class TenantGroupType(OrganizationalObjectType):
     parent: Annotated["TenantGroupType", strawberry.lazy('tenancy.graphql.types')] | None
 
     tenants: List[TenantType]
+    children: List[Annotated["TenantGroupType", strawberry.lazy('tenancy.graphql.types')]]
 
 
 #
@@ -99,6 +100,7 @@ class ContactGroupType(OrganizationalObjectType):
     parent: Annotated["ContactGroupType", strawberry.lazy('tenancy.graphql.types')] | None
 
     contacts: List[ContactType]
+    children: List[Annotated["ContactGroupType", strawberry.lazy('tenancy.graphql.types')]]
 
 
 @strawberry_django.type(

netbox/utilities/forms/widgets/select.py

@@ -43,9 +43,12 @@ class HTMXSelect(forms.Select):
     """
     Selection widget that will re-generate the HTML form upon the selection of a new option.
     """
-    def __init__(self, hx_url='.', hx_target_id='form_fields', attrs=None, **kwargs):
+    def __init__(self, method='get', hx_url='.', hx_target_id='form_fields', attrs=None, **kwargs):
+        method = method.lower()
+        if method not in ('delete', 'get', 'patch', 'post', 'put'):
+            raise ValueError(f"Unsupported HTTP method: {method}")
         _attrs = {
-            'hx-get': hx_url,
+            f'hx-{method}': hx_url,
             'hx-include': f'#{hx_target_id}',
             'hx-target': f'#{hx_target_id}',
         }

netbox/wireless/graphql/types.py

@@ -23,6 +23,7 @@ class WirelessLANGroupType(OrganizationalObjectType):
     parent: Annotated["WirelessLANGroupType", strawberry.lazy('wireless.graphql.types')] | None
 
     wireless_lans: List[Annotated["WirelessLANType", strawberry.lazy('wireless.graphql.types')]]
+    children: List[Annotated["WirelessLANGroupType", strawberry.lazy('wireless.graphql.types')]]
 
 
 @strawberry_django.type(