Squashed commit

Use managed fonts
Include userentities dynamically in grocy.openapi.json for /userfields/{entity}/{objectId} endpoints (closes #1218)
Fixed userfieldsform load / save (for products and recipes) handling (fixes #1302)
Fixed PUT/DELETE /objects/{entity}/{objectId} when the given object id was invalid (fixes #1396)
Allow arrays in HTMLPurifier (fixes #1407)
This commit is contained in:
Bernd Bestel
2021-06-28 17:00:16 +02:00
parent acb81187d9
commit 35fb87ab1e
35 changed files with 51 additions and 1408 deletions

View File

@@ -1,6 +1,8 @@
function saveRecipePicture(result, location, jsonData)
{
var recipeId = Grocy.EditObjectId || result.created_object_id;
Grocy.EditObjectId = recipeId; // Grocy.EditObjectId is not yet set when adding a recipe
Grocy.Components.UserfieldsForm.Save(() =>
{
if (jsonData.hasOwnProperty("picture_file_name") && !Grocy.DeleteRecipePictureOnSave)