Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-08-02 19:55:18 +02:00
Code Issues Releases Activity

Fix custom default category

Browse source
This commit is contained in:
Sean Morley 2024-11-26 15:10:17 -05:00
parent 17d8784d8c
commit ce0b82acb7
10 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/server/adventures/migrations/0011_category_adventure_category.py
View file

@ -19,7 +19,7 @@ class Migration(migrations.Migration):
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
('name', models.CharField(max_length=200)),
('display_name', models.CharField(max_length=200)),
('icon', models.CharField(default='🌎', max_length=200)),
('icon', models.CharField(default='🌍', max_length=200)),
('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
options={

4
backend/server/adventures/models.py
View file

@ -111,7 +111,7 @@ class Adventure(models.Model):
if force_insert and force_update:
raise ValueError("Cannot force both insert and updating in model saving.")
if not self.category:
self.category = Category.objects.get_or_create(user_id=self.user_id, name='general', display_name='General', icon='🌎')[0]
self.category = Category.objects.get_or_create(user_id=self.user_id, name='general', display_name='General', icon='🌍')[0]
return super().save(force_insert, force_update, using, update_fields)
def __str__(self):
@ -260,7 +260,7 @@ class Category(models.Model):
User, on_delete=models.CASCADE, default=default_user_id)
name = models.CharField(max_length=200)
display_name = models.CharField(max_length=200)
icon = models.CharField(max_length=200, default='🌎')
icon = models.CharField(max_length=200, default='🌍')
class Meta:
verbose_name_plural = 'Categories'

2
backend/server/adventures/serializers.py
View file

@ -90,7 +90,7 @@ class AdventureSerializer(CustomModelSerializer):
if isinstance(category_data, dict):
name = category_data.get('name', '').lower()
display_name = category_data.get('display_name', name)
icon = category_data.get('icon', '🌎')
icon = category_data.get('icon', '<EFBFBD>')
else:
name = category_data.name.lower()
display_name = category_data.display_name

2
backend/server/adventures/views.py
View file

@ -644,7 +644,7 @@ class CategoryViewSet(viewsets.ModelViewSet):
general_category = Category.objects.filter(user_id=request.user, name='general').first()
if not general_category:
general_category = Category.objects.create(user_id=request.user, name='general', icon='🌎', display_name='General')
general_category = Category.objects.create(user_id=request.user, name='general', icon='🌍', display_name='General')
Adventure.objects.filter(category=instance).update(category=general_category)