Compare commits

...

5 Commits

Author SHA1 Message Date
cb38f2a157 Merge pull request 'master' (#292) from master into Docker
Reviewed-on: SGD-Nord/konova#292
2023-02-06 15:01:50 +01:00
9b3dba9eab Merge pull request '#290 Egon exporter file name' (#291) from 290_EGON_Exporter_file_name into master
Reviewed-on: SGD-Nord/konova#291
2023-02-06 15:01:29 +01:00
c13216761e #290 Egon exporter file name
* replace user given file name with file based file name for egon export handling
2023-02-06 15:00:34 +01:00
6f2b45b62d Merge pull request 'Bugfix' (#289) from fix_shared_users_on_comps into master
Reviewed-on: SGD-Nord/konova#289
2023-02-02 16:34:47 +01:00
3390593bff Bugfix
* fixes rendering of shared users counter on unshared compensation entries
2023-02-02 16:34:09 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -130,7 +130,7 @@
{% else %}
<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' %}
{{obj.users.count}} {% trans 'other users' %}
{{obj.intervention.users.count}} {% trans 'other users' %}
</span>
{% endif %}
</td>

View File

@ -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