kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

ixed that the delete button not always deleted the currently selected equipment item (fixes #307)

Browse Source
This commit is contained in:
Bernd Bestel 2019-08-15 13:53:30 +02:00
parent f88ed1ee8a
commit be4b5c81b2
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/52_UNRELEASED_2019-xx-xx.md
View File

@ -2,11 +2,14 @@
- You can now print a "Location Content Sheet" with the current stock per location - new button at the top of the stock overview page
- Chores improvements
- New option "Due date rollover" per chore which means the chore can never be overdue, the due date will shift forward each day when due
- Equipment improvements/fixes
- Fixed that the delete button not always deleted the currently selected equipment item
- General improvements/fixes
- Improved the handling which entry page to use with disabled feature flags (thanks @nielstholenaar)
- Fixed that the Userfield type "Preset list" had always the caption "Product group" instead of the configured one (thanks @oncleben31)
- API improvements
- New endpoint `/stock/shoppinglist/remove-product` to remove a product from a shopping list (thanks @Forceu)
- When adding a product (through `stock/product/{productId}/add` or `stock/product/{productId}/inventory`) with omitted best before date and if the given product has "Default best before days" set, the best before date is calculated based on that (so far always today was used which is still the case when no date is supplied and also the product has no "Default best before days set) (thanks @Forceu)
- Field `stock_amount` of endpoint `/stock/products/{productId}´ now returns `0` instead of `null` when the given product is not in stock (thanks @Forceu)
- New endpoint `/objects/{entity}/search/{searchString}` search for objects by name (contains search)
- It's now also possible to provide the API key via a query parameter (same name as the header, so `GROCY-API-KEY`)

3
localization/strings.pot
View File

@ -1313,3 +1313,6 @@ msgstr ""
msgid "Time of printing"
msgstr ""
msgid "Are you sure to delete equipment \"%s\"?"
msgstr ""

2
public/viewjs/equipment.js
View File

@ -41,6 +41,8 @@ function DisplayEquipment(id)
$(".selected-equipment-name").text(equipmentItem.name);
$("#description-tab-content").html(equipmentItem.description);
$(".equipment-edit-button").attr("href", U("/equipment/" + equipmentItem.id.toString()));
$(".equipment-delete-button").attr("data-equipment-id", equipmentItem.id);
$(".equipment-delete-button").attr("data-equipment-name", equipmentItem.name);
if (equipmentItem.instruction_manual_file_name !== null && !equipmentItem.instruction_manual_file_name.isEmpty())
{