fixed generic modal form error (merge conflict)

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>

vue/src/components/Modals/GenericModalForm.vue

@@ -94,6 +94,7 @@ export default {
             },
         },
         show: {required: true, type: Boolean, default: false},
+        models: {required: false, type: Function, default: null}
     },
     data() {
         return {

vue/src/utils/models.js

@@ -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",