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

tests for single food reset inherit and additional inheritted fields

Browse Source
This commit is contained in:
smilerz
2022-02-07 09:16:48 -06:00
parent ab52bd1a07
commit d6af318c21
7 changed files with 119 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vue/src/locales/en.json
View File

@ -328,11 +328,14 @@
"view_recipe": "View Recipe",
"filter": "Filter",
"reset_children": "Reset Child Inheritance",
"reset_children_help": "Overwrite all children with values from inherited fields.",
"reset_children_help": "Overwrite all children with values from inherited fields. Inheritted fields of children will be set to Inherit Fields unless Children Inherit Fields is set.",
"substitute_help": "Substitutes are considered when searching for recipes that can be made with onhand ingredients.",
"substitute_siblings_help": "All food that share a parent of this food are considered substitutes.",
"substitute_children_help": "All food that are children of this food are considered substitutes.",
"substitute_siblings": "Substitute Siblings",
"substitute_children": "Substitute Children",
"SubstituteOnHand": "You have a substitute on hand."
"SubstituteOnHand": "You have a substitute on hand.",
"ChildInheritFields": "Children Inherit Fields",
"ChildInheritFields_help": "Children will inherit these fields by default.",
"InheritFields_help": "The values of these fields will be inheritted from parent (Exception: blank shopping categories are not inheritted)"
}

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

@ -90,6 +90,7 @@ export class Models {
"substitute_siblings",
"substitute_children",
"reset_inherit",
"child_inherit_fields",
],
],
@ -179,6 +180,18 @@ export class Models {
list: "FOOD_INHERIT_FIELDS",
label: i18n.t("InheritFields"),
condition: { field: "food_children_exist", value: true, condition: "preference_equals" },
help_text: i18n.t("InheritFields_help"),
},
child_inherit_fields: {
form_field: true,
advanced: true,
type: "lookup",
multiple: true,
field: "child_inherit_fields",
list: "FOOD_INHERIT_FIELDS",
label: i18n.t("ChildInheritFields"),
condition: { field: "numchild", value: 0, condition: "gt" },
help_text: i18n.t("ChildInheritFields_help"),
},
reset_inherit: {
form_field: true,