1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Add description field to SecretRole model (#3655)

This commit is contained in:
Jeremy Stretch
2019-12-10 13:03:09 -05:00
parent 7845d9b25f
commit 24bdd10b4f
5 changed files with 28 additions and 6 deletions

View File

@ -18,7 +18,7 @@ class SecretRoleSerializer(ValidatedModelSerializer):
class Meta: class Meta:
model = SecretRole model = SecretRole
fields = ['id', 'name', 'slug', 'secret_count'] fields = ['id', 'name', 'slug', 'description', 'secret_count']
class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer): class SecretSerializer(TaggitSerializer, CustomFieldModelSerializer):

View File

@ -42,7 +42,7 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
class Meta: class Meta:
model = SecretRole model = SecretRole
fields = [ fields = [
'name', 'slug', 'users', 'groups', 'name', 'slug', 'description', 'users', 'groups',
] ]
widgets = { widgets = {
'users': StaticSelect2Multiple(), 'users': StaticSelect2Multiple(),

View File

@ -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),
),
]

View File

@ -270,6 +270,10 @@ class SecretRole(ChangeLoggedModel):
slug = models.SlugField( slug = models.SlugField(
unique=True unique=True
) )
description = models.CharField(
max_length=100,
blank=True,
)
users = models.ManyToManyField( users = models.ManyToManyField(
to=User, to=User,
related_name='secretroles', related_name='secretroles',
@ -281,7 +285,7 @@ class SecretRole(ChangeLoggedModel):
blank=True blank=True
) )
csv_headers = ['name', 'slug'] csv_headers = ['name', 'slug', 'description']
class Meta: class Meta:
ordering = ['name'] ordering = ['name']
@ -296,6 +300,7 @@ class SecretRole(ChangeLoggedModel):
return ( return (
self.name, self.name,
self.slug, self.slug,
self.description,
) )
def has_member(self, user): def has_member(self, user):

View File

@ -19,16 +19,15 @@ SECRETROLE_ACTIONS = """
class SecretRoleTable(BaseTable): class SecretRoleTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
name = tables.LinkColumn(verbose_name='Name') name = tables.LinkColumn()
secret_count = tables.Column(verbose_name='Secrets') secret_count = tables.Column(verbose_name='Secrets')
slug = tables.Column(verbose_name='Slug')
actions = tables.TemplateColumn( actions = tables.TemplateColumn(
template_code=SECRETROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' template_code=SECRETROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name=''
) )
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = SecretRole model = SecretRole
fields = ('pk', 'name', 'secret_count', 'slug', 'actions') fields = ('pk', 'name', 'secret_count', 'description', 'slug', 'actions')
# #