Merge branch 'develop-2.7' into 3569-api-choice-slugs

2019-12-05 17:43:11 -05:00
parent edbf562803 8cbd2f5c2d
commit 17898a4c57
27 changed files with 875 additions and 43 deletions
--- a/netbox/ipam/forms.py
+++ b/netbox/ipam/forms.py
@@ -240,7 +240,7 @@ class RoleForm(BootstrapMixin, forms.ModelForm):
    class Meta:
        model = Role
        fields = [
-            'name', 'slug',
+            'name', 'slug', 'weight',
        ]