cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed generic modal form error (merge conflict)

Browse Source
This commit is contained in:
vabene1111
2023-05-29 15:40:25 +02:00
parent a65e93a9b3
commit c0577abb89
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vue/src/utils/models.js
View File

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