From 8d496b0571ee1b5f781e762bbce714bae271d29e Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 10 Dec 2019 13:03:09 -0500
Subject: [PATCH] Add description field to SecretRole model (#3655)

---
 netbox/secrets/api/serializers.py              |  2 +-
 netbox/secrets/forms.py                        |  2 +-
 .../migrations/0007_secretrole_description.py  | 18 ++++++++++++++++++
 netbox/secrets/models.py                       |  7 ++++++-
 netbox/secrets/tables.py                       |  5 ++---
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 netbox/secrets/migrations/0007_secretrole_description.py

diff --git a/netbox/secrets/api/serializers.py b/netbox/secrets/api/serializers.py
index 7a0447a39..e278f3c40 100644
--- a/netbox/secrets/api/serializers.py
+++ b/netbox/secrets/api/serializers.py
@@ -18,7 +18,7 @@ class SecretRoleSerializer(ValidatedModelSerializer):
 
     class Meta:
         model = SecretRole
-        fields = ['id', 'name', 'slug', 'secret_count']
+        fields = ['id', 'name', 'slug', 'description', 'secret_count']
 
 
 class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):
diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py
index ed0f455c1..064e7dbf8 100644
--- a/netbox/secrets/forms.py
+++ b/netbox/secrets/forms.py
@@ -42,7 +42,7 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
     class Meta:
         model = SecretRole
         fields = [
-            'name', 'slug', 'users', 'groups',
+            'name', 'slug', 'description', 'users', 'groups',
         ]
         widgets = {
             'users': StaticSelect2Multiple(),
diff --git a/netbox/secrets/migrations/0007_secretrole_description.py b/netbox/secrets/migrations/0007_secretrole_description.py
new file mode 100644
index 000000000..abe13e09c
--- /dev/null
+++ b/netbox/secrets/migrations/0007_secretrole_description.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.6 on 2019-12-10 18:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('secrets', '0006_custom_tag_models'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='secretrole',
+            name='description',
+            field=models.CharField(blank=True, max_length=100),
+        ),
+    ]
diff --git a/netbox/secrets/models.py b/netbox/secrets/models.py
index 6dcb5abee..f14d2d982 100644
--- a/netbox/secrets/models.py
+++ b/netbox/secrets/models.py
@@ -270,6 +270,10 @@ class SecretRole(ChangeLoggedModel):
     slug = models.SlugField(
         unique=True
     )
+    description = models.CharField(
+        max_length=100,
+        blank=True,
+    )
     users = models.ManyToManyField(
         to=User,
         related_name='secretroles',
@@ -281,7 +285,7 @@ class SecretRole(ChangeLoggedModel):
         blank=True
     )
 
-    csv_headers = ['name', 'slug']
+    csv_headers = ['name', 'slug', 'description']
 
     class Meta:
         ordering = ['name']
@@ -296,6 +300,7 @@ class SecretRole(ChangeLoggedModel):
         return (
             self.name,
             self.slug,
+            self.description,
         )
 
     def has_member(self, user):
diff --git a/netbox/secrets/tables.py b/netbox/secrets/tables.py
index 1f937f54b..cc1760b93 100644
--- a/netbox/secrets/tables.py
+++ b/netbox/secrets/tables.py
@@ -19,16 +19,15 @@ SECRETROLE_ACTIONS = """
 
 class SecretRoleTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn(verbose_name='Name')
+    name = tables.LinkColumn()
     secret_count = tables.Column(verbose_name='Secrets')
-    slug = tables.Column(verbose_name='Slug')
     actions = tables.TemplateColumn(
         template_code=SECRETROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name=''
     )
 
     class Meta(BaseTable.Meta):
         model = SecretRole
-        fields = ('pk', 'name', 'secret_count', 'slug', 'actions')
+        fields = ('pk', 'name', 'secret_count', 'description', 'slug', 'actions')
 
 
 #