diff --git a/netbox/extras/api/serializers_/tableconfigs.py b/netbox/extras/api/serializers_/tableconfigs.py index 6f5af136a..7a4fb7b2a 100644 --- a/netbox/extras/api/serializers_/tableconfigs.py +++ b/netbox/extras/api/serializers_/tableconfigs.py @@ -16,7 +16,7 @@ class TableConfigSerializer(ValidatedModelSerializer): class Meta: model = TableConfig fields = [ - 'id', 'url', 'display_url', 'display', 'object_type', 'table', 'name', 'slug', 'description', 'user', - 'weight', 'enabled', 'shared', 'columns', 'ordering', 'created', 'last_updated', + 'id', 'url', 'display_url', 'display', 'object_type', 'table', 'name', 'description', 'user', 'weight', + 'enabled', 'shared', 'columns', 'ordering', 'created', 'last_updated', ] - brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'object_type', 'table') + brief_fields = ('id', 'url', 'display', 'name', 'description', 'object_type', 'table') diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 32f53e8d5..f03359fcf 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -355,7 +355,7 @@ class TableConfigFilterSet(ChangeLoggedModelFilterSet): class Meta: model = TableConfig - fields = ('id', 'name', 'slug', 'description', 'table', 'enabled', 'shared', 'weight') + fields = ('id', 'name', 'description', 'table', 'enabled', 'shared', 'weight') def search(self, queryset, name, value): if not value.strip(): diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py index bd0d43cd9..418aa6aae 100644 --- a/netbox/extras/forms/model_forms.py +++ b/netbox/extras/forms/model_forms.py @@ -305,7 +305,6 @@ class SavedFilterForm(forms.ModelForm): class TableConfigForm(forms.ModelForm): - slug = SlugField() object_type = ContentTypeChoiceField( label=_('Object type'), queryset=ObjectType.objects.all() diff --git a/netbox/extras/graphql/filters.py b/netbox/extras/graphql/filters.py index eefd5152d..2798c4896 100644 --- a/netbox/extras/graphql/filters.py +++ b/netbox/extras/graphql/filters.py @@ -266,7 +266,6 @@ class SavedFilterFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): @strawberry_django.filter(models.TableConfig, lookups=True) class TableConfigFilter(BaseObjectTypeFilterMixin, ChangeLogFilterMixin): name: FilterLookup[str] | None = strawberry_django.filter_field() - slug: FilterLookup[str] | None = strawberry_django.filter_field() description: FilterLookup[str] | None = strawberry_django.filter_field() user: Annotated['UserFilter', strawberry.lazy('users.graphql.filters')] | None = strawberry_django.filter_field() user_id: ID | None = strawberry_django.filter_field() diff --git a/netbox/extras/migrations/0127_tableconfig.py b/netbox/extras/migrations/0127_tableconfig.py index 22f839c0b..e4cc30b70 100644 --- a/netbox/extras/migrations/0127_tableconfig.py +++ b/netbox/extras/migrations/0127_tableconfig.py @@ -20,7 +20,6 @@ class Migration(migrations.Migration): ('last_updated', models.DateTimeField(auto_now=True, null=True)), ('table', models.CharField(max_length=100)), ('name', models.CharField(max_length=100)), - ('slug', models.SlugField(max_length=100)), ('description', models.CharField(blank=True, max_length=200)), ('weight', models.PositiveSmallIntegerField(default=100)), ('enabled', models.BooleanField(default=True)), diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py index 3816b18e6..21b582c19 100644 --- a/netbox/extras/models/models.py +++ b/netbox/extras/models/models.py @@ -544,10 +544,6 @@ class TableConfig(CloningMixin, ChangeLoggedModel): verbose_name=_('name'), max_length=100, ) - slug = models.SlugField( - verbose_name=_('slug'), - max_length=100, - ) description = models.CharField( verbose_name=_('description'), max_length=200, diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index bbb33d18d..54e3e761a 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -304,8 +304,8 @@ class TableConfigTable(NetBoxTable): class Meta(NetBoxTable.Meta): model = TableConfig fields = ( - 'pk', 'id', 'name', 'slug', 'object_type', 'table', 'description', 'user', 'weight', 'enabled', 'shared', - 'created', 'last_updated', + 'pk', 'id', 'name', 'object_type', 'table', 'description', 'user', 'weight', 'enabled', 'shared', 'created', + 'last_updated', ) default_columns = ( 'pk', 'name', 'object_type', 'table', 'user', 'description', 'enabled', 'shared', diff --git a/netbox/templates/extras/tableconfig_edit.html b/netbox/templates/extras/tableconfig_edit.html index bfe508a8e..ce39904f2 100644 --- a/netbox/templates/extras/tableconfig_edit.html +++ b/netbox/templates/extras/tableconfig_edit.html @@ -10,7 +10,6 @@

{% trans "Device" %}

{% render_field form.name %} - {% render_field form.slug %} {% render_field form.object_type %} {% render_field form.table %} {% render_field form.description %}