Merge branch 'develop' into develop-2.7

2019-12-10 11:51:10 -05:00
parent 12657ebd7c 3c36bec298
commit 9452cebc6a
14 changed files with 63 additions and 17 deletions
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -1250,6 +1250,10 @@ class VLANFilterForm(BootstrapMixin, TenancyFilterForm, CustomFieldFilterForm):
 #

 class ServiceForm(BootstrapMixin, CustomFieldForm):
+    port = forms.IntegerField(
+        min_value=1,
+        max_value=65535
+    )
    tags = TagField(
        required=False
    )