Jelajahi Sumber

Merge branch 'develop' into feature

jeremystretch 4 tahun lalu
induk
melakukan
3e7922e41e

+ 1 - 1
.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -17,7 +17,7 @@ body:
         What version of NetBox are you currently running? (If you don't have access to the most
         What version of NetBox are you currently running? (If you don't have access to the most
         recent NetBox release, consider testing on our [demo instance](https://demo.netbox.dev/)
         recent NetBox release, consider testing on our [demo instance](https://demo.netbox.dev/)
         before opening a bug report to see if your issue has already been addressed.)
         before opening a bug report to see if your issue has already been addressed.)
-      placeholder: v3.0.6
+      placeholder: v3.0.7
     validations:
     validations:
       required: true
       required: true
   - type: dropdown
   - type: dropdown

+ 1 - 1
.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -14,7 +14,7 @@ body:
     attributes:
     attributes:
       label: NetBox version
       label: NetBox version
       description: What version of NetBox are you currently running?
       description: What version of NetBox are you currently running?
-      placeholder: v3.0.6
+      placeholder: v3.0.7
     validations:
     validations:
       required: true
       required: true
   - type: dropdown
   - type: dropdown

+ 5 - 1
docs/release-notes/version-3.0.md

@@ -1,6 +1,10 @@
 # NetBox v3.0
 # NetBox v3.0
 
 
-## v3.0.7 (FUTURE)
+## v3.0.8 (FUTURE)
+
+---
+
+## v3.0.7 (2021-10-08)
 
 
 ### Enhancements
 ### Enhancements
 
 

+ 9 - 0
netbox/dcim/filtersets.py

@@ -480,12 +480,21 @@ class DeviceTypeFilterSet(PrimaryModelFilterSet):
 
 
 
 
 class DeviceTypeComponentFilterSet(django_filters.FilterSet):
 class DeviceTypeComponentFilterSet(django_filters.FilterSet):
+    q = django_filters.CharFilter(
+        method='search',
+        label='Search',
+    )
     devicetype_id = django_filters.ModelMultipleChoiceFilter(
     devicetype_id = django_filters.ModelMultipleChoiceFilter(
         queryset=DeviceType.objects.all(),
         queryset=DeviceType.objects.all(),
         field_name='device_type_id',
         field_name='device_type_id',
         label='Device type (ID)',
         label='Device type (ID)',
     )
     )
 
 
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        return queryset.filter(name__icontains=value)
+
 
 
 class ConsolePortTemplateFilterSet(ChangeLoggedModelFilterSet, DeviceTypeComponentFilterSet):
 class ConsolePortTemplateFilterSet(ChangeLoggedModelFilterSet, DeviceTypeComponentFilterSet):
 
 

+ 1 - 1
netbox/netbox/settings.py

@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 # Environment setup
 #
 #
 
 
-VERSION = '3.0.7-dev'
+VERSION = '3.0.8-dev'
 
 
 # Hostname
 # Hostname
 HOSTNAME = platform.node()
 HOSTNAME = platform.node()

+ 1 - 1
requirements.txt

@@ -18,7 +18,7 @@ gunicorn==20.1.0
 Jinja2==3.0.2
 Jinja2==3.0.2
 Markdown==3.3.4
 Markdown==3.3.4
 markdown-include==0.6.0
 markdown-include==0.6.0
-mkdocs-material==7.3.1
+mkdocs-material==7.3.2
 netaddr==0.8.0
 netaddr==0.8.0
 Pillow==8.3.2
 Pillow==8.3.2
 psycopg2-binary==2.9.1
 psycopg2-binary==2.9.1