From bcf1941a810545fd7ae73e9a88140da99f899f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Mon, 29 Mar 2021 21:28:48 +0200 Subject: [PATCH] [pricelist] fix some merge issues --- flaschengeist/plugins/pricelist/__init__.py | 1 - flaschengeist/plugins/pricelist/pricelist_controller.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/flaschengeist/plugins/pricelist/__init__.py b/flaschengeist/plugins/pricelist/__init__.py index 9d5151a..dff3bb6 100644 --- a/flaschengeist/plugins/pricelist/__init__.py +++ b/flaschengeist/plugins/pricelist/__init__.py @@ -252,6 +252,5 @@ def set_picture(identifier): def _get_picture(identifier): if request.method == "GET": size = request.args.get("size") - path = PriceListPlugin.plugin["path"] response = pricelist_controller.get_drink_picture(identifier, size) return response.make_conditional(request) \ No newline at end of file diff --git a/flaschengeist/plugins/pricelist/pricelist_controller.py b/flaschengeist/plugins/pricelist/pricelist_controller.py index 6a115f5..6713b67 100644 --- a/flaschengeist/plugins/pricelist/pricelist_controller.py +++ b/flaschengeist/plugins/pricelist/pricelist_controller.py @@ -5,7 +5,7 @@ from uuid import uuid4 from flaschengeist import logger from flaschengeist.config import config from flaschengeist.database import db -from flaschengeist.utils.picture import save_picture, get_picture +from flaschengeist.utils.picture import save_picture, get_picture, delete_picture from .models import Drink, DrinkPrice, Ingredient, Tag, DrinkType, DrinkPriceVolume, DrinkIngredient, ExtraIngredient