kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-21 04:43:32 +00:00
Code Issues Projects Releases Wiki Activity

Optimized initial focus / workflow handling for recipeposform and shoppinglistitemform

Browse Source
This commit is contained in:
Bernd Bestel
2023-11-04 13:19:46 +01:00
parent fdf5559c25
commit f01ca33c33
2 changed files with 67 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/viewjs/shoppinglistitemform.js
View File

@@ -273,7 +273,7 @@ if (GetUriParam("amount") !== undefined)
Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
}
if (GetUriParam("embedded") !== undefined)
if (!Grocy.Components.ProductPicker.InAnyFlow())
{
if (GetUriParam("product") !== undefined || Grocy.EditMode == "edit")
{
@@ -282,7 +282,10 @@ if (GetUriParam("embedded") !== undefined)
Grocy.Components.ProductPicker.GetPicker().trigger('change');
}
$("#display_amount").focus();
setTimeout(function()
{
$("#display_amount").focus();
}, 250);
}
else
{
@@ -292,6 +295,18 @@ if (GetUriParam("embedded") !== undefined)
}, 250);
}
}
else
{
Grocy.Components.ProductPicker.GetPicker().trigger('change');
if (Grocy.Components.ProductPicker.InProductModifyWorkflow())
{
setTimeout(function()
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}, 250);
}
}
var eitherRequiredFields = $("#product_id,#product_id_text_input,#note");
eitherRequiredFields.prop('required', "");