Merge branch 'main' into staging

open5e · Oct 26, 2023 · fb8e03a · fb8e03a
2 parents fd98109 + 5836ad5
commit fb8e03a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/api_v2/migrations/0001_initial.py b/api_v2/migrations/0001_initial.py
@@ -89,7 +89,7 @@ class Migration(migrations.Migration):
                 ('creature', models.ForeignKey(help_text='The creature to which this action belongs.', on_delete=django.db.models.deletion.CASCADE, to='api_v2.creature')),
             ],
             options={
-                'abstract': False,
+                'verbose_name_plural': 'armor',
             },
         ),
         migrations.CreateModel(

diff --git a/api_v2/models/abstracts.py b/api_v2/models/abstracts.py
@@ -100,7 +100,6 @@ class Meta:
         abstract = True
         ordering = ['pk']
 
-
 class Benefit(HasName, HasDescription):
     class Meta:
         abstract = True

diff --git a/api_v2/views.py b/api_v2/views.py
@@ -257,7 +257,3 @@ class RaceViewSet(viewsets.ReadOnlyModelViewSet):
     queryset = models.Race.objects.all().order_by('pk')
     serializer_class = serializers.RaceSerializer
     filterset_class = RaceFilterSet
-
-
-
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -257,7 +257,3 @@ class RaceViewSet(viewsets.ReadOnlyModelViewSet):
		queryset = models.Race.objects.all().order_by('pk')
		serializer_class = serializers.RaceSerializer
		filterset_class = RaceFilterSet