kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-12 16:44:55 +00:00
Code Issues Projects Releases Wiki Activity

Fixed various smaller problems after some testing

Browse Source
This commit is contained in:
Bernd Bestel
2019-09-21 13:08:42 +02:00
parent 327c1f4fb3
commit b57fd83cb8
8 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/viewjs/components/productamountpicker.js
View File

@@ -3,9 +3,10 @@ Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled = false;
Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuId, forceInitialDisplayQu = false)
{
var conversionsForProduct = FindAllObjectsInArrayByPropertyValue(Grocy.QuantityUnitConversionsResolved, 'product_id', productId);
if (!Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled)
{
var conversionsForProduct = FindAllObjectsInArrayByPropertyValue(Grocy.QuantityUnitConversionsResolved, 'product_id', productId);
$("#qu_id").find("option").remove().end();
$("#qu_id").attr("data-destination-qu-name", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name);
conversionsForProduct.forEach(conversion =>
@@ -27,6 +28,11 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
Grocy.Components.ProductAmountPicker.InitalValueSet = true;
}
if (conversionsForProduct.length === 1)
{
$("#qu_id").val($("#qu_id option:first").val());
}
$(".input-group-productamountpicker").trigger("change");
}