kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-28 09:01:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix shopping list edit form - product was not prefilled (fixes #115)

Browse Source
This commit is contained in:
Bernd Bestel
2018-11-26 19:37:17 +01:00
parent e92d74f5c3
commit 5cdf2c14d3
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/viewjs/components/productpicker.js
View File

@@ -75,6 +75,11 @@ if (typeof prefillProduct !== "undefined")
}
var prefillProductId = GetUriParam("product");
var prefillProductId2 = Grocy.Components.ProductPicker.GetPicker().parent().data('prefill-by-id').toString();
if (!prefillProductId2.isEmpty())
{
prefillProductId = prefillProductId2;
}
if (typeof prefillProductId !== "undefined")
{
$('#product_id').val(prefillProductId);

9
public/viewjs/shoppinglistform.js
View File

@@ -59,14 +59,11 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
});
Grocy.FrontendHelpers.ValidateForm('shoppinglist-form');
Grocy.Components.ProductPicker.GetInputElement().focus();
if (Grocy.Components.ProductPicker.InProductAddWorkflow() === false)
if (Grocy.EditMode === "edit")
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}
else
{
Grocy.Components.ProductPicker.GetPicker().trigger('change');
Grocy.Components.ProductPicker.GetPicker().trigger('change');
}
$('#amount').on('focus', function(e)