mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2025-07-24 07:19:36 +02:00
Fix general category handling
This commit is contained in:
parent
ce0b82acb7
commit
adf45ff557
16 changed files with 192 additions and 126 deletions
|
@ -111,7 +111,16 @@ 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]
|
||||
category, created = Category.objects.get_or_create(
|
||||
user_id=self.user_id,
|
||||
name='general',
|
||||
defaults={
|
||||
'display_name': 'General',
|
||||
'icon': '🌍'
|
||||
}
|
||||
)
|
||||
self.category = category
|
||||
|
||||
return super().save(force_insert, force_update, using, update_fields)
|
||||
|
||||
def __str__(self):
|
||||
|
@ -273,4 +282,4 @@ class Category(models.Model):
|
|||
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
return self.name + ' - ' + self.display_name + ' - ' + self.icon
|
|
@ -118,6 +118,7 @@ class AdventureSerializer(CustomModelSerializer):
|
|||
def create(self, validated_data):
|
||||
visits_data = validated_data.pop('visits', [])
|
||||
category_data = validated_data.pop('category', None)
|
||||
print(category_data)
|
||||
adventure = Adventure.objects.create(**validated_data)
|
||||
for visit_data in visits_data:
|
||||
Visit.objects.create(adventure=adventure, **visit_data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue