diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index 5ebc52390..1e1759408 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -71,7 +71,7 @@ class RoleSerializer(ValidatedModelSerializer): class Meta: model = Role - fields = ['id', 'name', 'slug', 'weight', 'prefix_count', 'vlan_count'] + fields = ['id', 'name', 'slug', 'weight', 'description', 'prefix_count', 'vlan_count'] class VLANGroupSerializer(ValidatedModelSerializer): diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 0df5c2a5b..e2f45ac52 100644 --- 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', 'weight', + 'name', 'slug', 'weight', 'description', ] diff --git a/netbox/ipam/migrations/0032_role_description.py b/netbox/ipam/migrations/0032_role_description.py new file mode 100644 index 000000000..5a6206bbc --- /dev/null +++ b/netbox/ipam/migrations/0032_role_description.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.6 on 2019-12-10 17:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ipam', '0031_3569_service_fields'), + ] + + operations = [ + migrations.AddField( + model_name='role', + name='description', + field=models.CharField(blank=True, max_length=100), + ), + ] diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 68cefe77f..759215e0b 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -260,8 +260,12 @@ class Role(ChangeLoggedModel): weight = models.PositiveSmallIntegerField( default=1000 ) + description = models.CharField( + max_length=100, + blank=True, + ) - csv_headers = ['name', 'slug', 'weight'] + csv_headers = ['name', 'slug', 'weight', 'description'] class Meta: ordering = ['weight', 'name'] @@ -274,6 +278,7 @@ class Role(ChangeLoggedModel): self.name, self.slug, self.weight, + self.description, ) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 91f195ba0..c66d2d820 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -288,11 +288,15 @@ class RoleTable(BaseTable): orderable=False, verbose_name='VLANs' ) - actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') + actions = tables.TemplateColumn( + template_code=ROLE_ACTIONS, + attrs={'td': {'class': 'text-right noprint'}}, + verbose_name='' + ) class Meta(BaseTable.Meta): model = Role - fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'slug', 'weight', 'actions') + fields = ('pk', 'name', 'prefix_count', 'vlan_count', 'description', 'slug', 'weight', 'actions') #