mirror of
https://github.com/grocy/grocy.git
synced 2025-04-29 01:32:38 +00:00
Fixed consume page location dropdown handling (fixes #2328)
This commit is contained in:
parent
b2295ce6d2
commit
b0d6e24bd4
57
changelog/74_UNRELEASED_xxxx-xx-xx.md
Normal file
57
changelog/74_UNRELEASED_xxxx-xx-xx.md
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
> ⚠️ xxxBREAKING CHANGESxxx
|
||||||
|
|
||||||
|
> ❗ xxxImportant upgrade informationXXX
|
||||||
|
|
||||||
|
> 💡 xxxMinor upgrade informationXXX
|
||||||
|
|
||||||
|
### New feature: xxxx
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Stock
|
||||||
|
|
||||||
|
- Fixed that the location dropdown on the consume page contained the same location multiple times if there are currently stock entries at multiple locations of the corresponding product
|
||||||
|
|
||||||
|
### Shopping list
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Recipes
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Meal plan
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Chores
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Calendar
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Tasks
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Batteries
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Equipment
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### Userfields
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### General
|
||||||
|
|
||||||
|
- xxx
|
||||||
|
|
||||||
|
### API
|
||||||
|
|
||||||
|
- xxx
|
@ -389,27 +389,36 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
|
|||||||
{
|
{
|
||||||
var setDefault = 0;
|
var setDefault = 0;
|
||||||
var stockAmountAtDefaultLocation = 0;
|
var stockAmountAtDefaultLocation = 0;
|
||||||
|
var addedLocations = [];
|
||||||
stockLocations.forEach(stockLocation =>
|
stockLocations.forEach(stockLocation =>
|
||||||
{
|
{
|
||||||
if (stockLocation.location_id == defaultLocationId)
|
if (stockLocation.location_id == defaultLocationId)
|
||||||
{
|
{
|
||||||
$("#location_id").append($("<option>", {
|
if (!addedLocations.includes(stockLocation.location_id))
|
||||||
value: stockLocation.location_id,
|
{
|
||||||
text: stockLocation.location_name + " (" + __t("Default location") + ")"
|
$("#location_id").append($("<option>", {
|
||||||
}));
|
value: stockLocation.location_id,
|
||||||
$("#location_id").val(defaultLocationId);
|
text: stockLocation.location_name + " (" + __t("Default location") + ")"
|
||||||
$("#location_id").trigger('change');
|
}));
|
||||||
setDefault = 1;
|
$("#location_id").val(defaultLocationId);
|
||||||
|
$("#location_id").trigger('change');
|
||||||
|
setDefault = 1;
|
||||||
|
}
|
||||||
stockAmountAtDefaultLocation += stockLocation.amount;
|
stockAmountAtDefaultLocation += stockLocation.amount;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$("#location_id").append($("<option>", {
|
if (!addedLocations.includes(stockLocation.location_id))
|
||||||
value: stockLocation.location_id,
|
{
|
||||||
text: stockLocation.location_name
|
$("#location_id").append($("<option>", {
|
||||||
}));
|
value: stockLocation.location_id,
|
||||||
|
text: stockLocation.location_name
|
||||||
|
}));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addedLocations.push(stockLocation.location_id);
|
||||||
|
|
||||||
if (setDefault == 0)
|
if (setDefault == 0)
|
||||||
{
|
{
|
||||||
$("#location_id").val(defaultLocationId);
|
$("#location_id").val(defaultLocationId);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user