From a53f17c1b9aecf873aaecfa4eff7ee4c3fda8fcf Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 May 2023 17:37:09 +0200
Subject: [PATCH] default properties food unit

---
 cookbook/serializer.py            |  5 ++++-
 vue/src/components/FoodEditor.vue | 12 ++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 0ce426aa..54ef4387 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -633,7 +633,10 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
             else:
                 validated_data['onhand_users'] = list(set(onhand_users) - set(shared_users))
 
-        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space,
+        if properties_food_unit := validated_data.pop('properties_food_unit', None):
+            properties_food_unit = Unit.objects.filter(name=properties_food_unit['name']).first()
+
+        obj, created = Food.objects.get_or_create(name=name, plural_name=plural_name, space=space, properties_food_unit=properties_food_unit,
                                                   defaults=validated_data)
         return obj
 
diff --git a/vue/src/components/FoodEditor.vue b/vue/src/components/FoodEditor.vue
index 656e68fa..882bbc4b 100644
--- a/vue/src/components/FoodEditor.vue
+++ b/vue/src/components/FoodEditor.vue
@@ -110,11 +110,11 @@
                             <b-col>
                                 <span v-if="uc.id">
                                     <b-btn class="btn btn-sm" variant="danger" @click="deleteUnitConversion(uc)"><i class="fas fa-trash-alt"></i></b-btn>
-                                    {{uc.base_amount}}
-                                    {{uc.base_unit.name}}
+                                    {{ uc.base_amount }}
+                                    {{ uc.base_unit.name }}
                                     =
-                                    {{uc.converted_amount}}
-                                    {{uc.converted_unit.name}}
+                                    {{ uc.converted_amount }}
+                                    {{ uc.converted_unit.name }}
                                 </span>
                                 <b-form class="mt-1">
                                     <b-input-group>
@@ -305,7 +305,7 @@ export default {
                 recipe: null,
                 properties: [],
                 properties_food_amount: 100,
-                properties_food_unit: null,
+                properties_food_unit: {name: 'g'},
                 food_onhand: false,
                 supermarket_category: null,
                 parent: null,
@@ -393,7 +393,7 @@ export default {
                 }
             )
         },
-        deleteUnitConversion: function (uc){
+        deleteUnitConversion: function (uc) {
             this.unit_conversions = this.unit_conversions.filter(u => u !== uc)
             let apiClient = new ApiApiFactory()
             apiClient.destroyUnitConversion(uc.id).then(r => {