From 676a76acf329069f732e7bae9103ec57f72cfe04 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Thu, 2 Feb 2023 16:34:09 +0100 Subject: [PATCH 1/2] Bugfix * fixes rendering of shared users counter on unshared compensation entries --- .../templates/compensation/detail/compensation/view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html index b40fc2f4..26800a83 100644 --- a/compensation/templates/compensation/detail/compensation/view.html +++ b/compensation/templates/compensation/detail/compensation/view.html @@ -130,7 +130,7 @@ {% else %} {% fa5_icon 'eye-slash' %} - {{obj.users.count}} {% trans 'other users' %} + {{obj.intervention.users.count}} {% trans 'other users' %} {% endif %} From c0ff113ff2bd4d5493d6bdc79a4768b251020dd8 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Mon, 6 Feb 2023 15:00:34 +0100 Subject: [PATCH 2/2] #290 Egon exporter file name * replace user given file name with file based file name for egon export handling --- intervention/utils/egon_export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intervention/utils/egon_export.py b/intervention/utils/egon_export.py index 2589595f..653a630a 100644 --- a/intervention/utils/egon_export.py +++ b/intervention/utils/egon_export.py @@ -152,7 +152,7 @@ class EgonGmlBuilder: "oneo:aufnahmezeitpunkt": doc.date_of_creation.strftime(DEFAULT_DATE_FORMAT), "oneo:bemerkung": doc.comment, "oneo:fotoverweis": base64.b64encode(doc.file.read()).decode("utf-8"), - "oneo:dateiname": doc.title, + "oneo:dateiname": doc.file.url.split("/")[-1], "oneo:hauptfoto": False, } } for doc in regular_docs