IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 37 Wiki Activity

master #292

Merged
mpeltriaux merged 4 commits from master into Docker 2023-02-06 15:01:50 +01:00
Conversation 0 Commits 4 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compensation/templates/compensation/detail/compensation/view.html
View File

@ -130,7 +130,7 @@
{% else %} {% else %}
<span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}"> <span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}">
{% fa5_icon 'eye-slash' %} {% fa5_icon 'eye-slash' %}
{{obj.users.count}} {% trans 'other users' %} {{obj.intervention.users.count}} {% trans 'other users' %}
</span> </span>
{% endif %} {% endif %}
</td> </td>

2
intervention/utils/egon_export.py
View File

@ -152,7 +152,7 @@ class EgonGmlBuilder:
"oneo:aufnahmezeitpunkt": doc.date_of_creation.strftime(DEFAULT_DATE_FORMAT), "oneo:aufnahmezeitpunkt": doc.date_of_creation.strftime(DEFAULT_DATE_FORMAT),
"oneo:bemerkung": doc.comment, "oneo:bemerkung": doc.comment,
"oneo:fotoverweis": base64.b64encode(doc.file.read()).decode("utf-8"), "oneo:fotoverweis": base64.b64encode(doc.file.read()).decode("utf-8"),
"oneo:dateiname": doc.title, "oneo:dateiname": doc.file.url.split("/")[-1],
"oneo:hauptfoto": False, "oneo:hauptfoto": False,
} }
} for doc in regular_docs } for doc in regular_docs