From c0577abb89f5adc4c07ac4f76b8e1d27f50bd33d Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Mon, 29 May 2023 15:40:25 +0200
Subject: [PATCH] fixed generic modal form error (merge conflict)

---
 cookbook/templates/base.html                  |  2 +-
 .../components/Modals/GenericModalForm.vue    | 21 +++++++++---------
 vue/src/utils/models.js                       | 22 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html
index 30756ef4e..e775bee09 100644
--- a/cookbook/templates/base.html
+++ b/cookbook/templates/base.html
@@ -277,7 +277,7 @@
                                             <i class="fas fa-database fa-2x"></i>
                                         </div>
                                         <div class="card-body text-break text-center p-0 no-gutters text-muted menu-dropdown-text">
-                                            {% trans 'Food Properties' %}
+                                            {% trans 'Properties' %}
                                         </div>
                                     </div>
                                 </a>
diff --git a/vue/src/components/Modals/GenericModalForm.vue b/vue/src/components/Modals/GenericModalForm.vue
index 05588add1..e0e545d9c 100644
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/vue/src/components/Modals/GenericModalForm.vue
@@ -7,19 +7,19 @@
             <b-modal :id="'modal_' + id" @hidden="cancelAction" size="lg">
                 <template v-slot:modal-title>
                     <h4 class="d-inline">{{ form.title }}</h4>
-                    <help-badge v-if="form.show_help" @show="show_help = true" @hide="show_help = false" :component="`GenericModal${form.title}`" />
+                    <help-badge v-if="form.show_help" @show="show_help = true" @hide="show_help = false" :component="`GenericModal${form.title}`"/>
                 </template>
                 <div v-for="(f, i) in form.fields" v-bind:key="i">
                     <p v-if="visibleCondition(f, 'instruction')">{{ f.label }}</p>
-                    <lookup-input v-if="visibleCondition(f, 'lookup')" :form="f" :model="listModel(f.list)" @change="storeValue" :help="showHelp && f.help" />
-                    <checkbox-input class="mb-3" v-if="visibleCondition(f, 'checkbox')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help" />
+                    <lookup-input v-if="visibleCondition(f, 'lookup')" :form="f" :model="listModel(f.list)" @change="storeValue" :help="showHelp && f.help"/>
+                    <checkbox-input class="mb-3" v-if="visibleCondition(f, 'checkbox')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help"/>
                     <text-input v-if="visibleCondition(f, 'text')" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" :help="showHelp && f.help" :subtitle="f.subtitle" :disabled="f.disabled"/>
-                    <choice-input v-if="visibleCondition(f, 'choice')" :label="f.label" :value="f.value" :field="f.field" :options="f.options" :placeholder="f.placeholder" />
-                    <emoji-input v-if="visibleCondition(f, 'emoji')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
-                    <file-input v-if="visibleCondition(f, 'file')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue" />
-                    <small-text v-if="visibleCondition(f, 'smalltext')" :value="f.value" />
-                    <date-input v-if="visibleCondition(f, 'date')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help" :subtitle="f.subtitle" />
-                    <number-input v-if="visibleCondition(f, 'number')" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" :help="showHelp && f.help" :subtitle="f.subtitle" />
+                    <choice-input v-if="visibleCondition(f, 'choice')" :label="f.label" :value="f.value" :field="f.field" :options="f.options" :placeholder="f.placeholder"/>
+                    <emoji-input v-if="visibleCondition(f, 'emoji')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue"/>
+                    <file-input v-if="visibleCondition(f, 'file')" :label="f.label" :value="f.value" :field="f.field" @change="storeValue"/>
+                    <small-text v-if="visibleCondition(f, 'smalltext')" :value="f.value"/>
+                    <date-input v-if="visibleCondition(f, 'date')" :label="f.label" :value="f.value" :field="f.field" :help="showHelp && f.help" :subtitle="f.subtitle"/>
+                    <number-input v-if="visibleCondition(f, 'number')" :label="f.label" :value="f.value" :field="f.field" :placeholder="f.placeholder" :help="showHelp && f.help" :subtitle="f.subtitle"/>
                 </div>
                 <template v-slot:modal-footer>
                     <div class="row w-100">
@@ -94,6 +94,7 @@ export default {
             },
         },
         show: {required: true, type: Boolean, default: false},
+        models: {required: false, type: Function, default: null}
     },
     data() {
         return {
@@ -110,7 +111,7 @@ export default {
         this.id = Math.random()
         this.$root.$on("change", this.storeValue) // bootstrap modal placed at document so have to listen at root of component
 
-        if (this.models !== null){
+        if (this.models !== null) {
             this.Models = this.models // override models definition file with prop
         }
     },
diff --git a/vue/src/utils/models.js b/vue/src/utils/models.js
index f554c887e..27e7546d2 100644
--- a/vue/src/utils/models.js
+++ b/vue/src/utils/models.js
@@ -279,7 +279,7 @@ export class Models {
         apiName: "Unit",
         paginated: true,
         create: {
-            params: [["name", "plural_name", "description","open_data_slug",]],
+            params: [["name", "plural_name", "description", "open_data_slug",]],
             form: {
                 show_help: true,
                 name: {
@@ -600,10 +600,19 @@ export class Models {
             },
         },
         create: {
-            params: [['base_amount', 'base_unit', 'converted_amount', 'converted_unit', 'food', 'open_data_slug']],
+            params: [['food', 'base_amount', 'base_unit', 'converted_amount', 'converted_unit', 'open_data_slug']],
             form: {
                 show_help: true,
                 // TODO add proper help texts for everything
+                food: {
+                    form_field: true,
+                    type: "lookup",
+                    field: "food",
+                    list: "FOOD",
+                    list_label: "name",
+                    label: "Food",
+                    multiple: false,
+                },
                 base_amount: {
                     form_field: true,
                     type: "text",
@@ -636,15 +645,6 @@ export class Models {
                     label: "converted_unit",
                     multiple: false,
                 },
-                food: {
-                    form_field: true,
-                    type: "lookup",
-                    field: "food",
-                    list: "FOOD",
-                    list_label: "name",
-                    label: "Food",
-                    multiple: false,
-                },
                 open_data_slug: {
                     form_field: true,
                     type: "text",