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

Merge pull request '#180 Shared data users hidden' (#181) from 180_Visibility_of_contact_data into master

Browse Source 
Reviewed-on: SGD-Nord/konova#181
This commit is contained in:
mpeltriaux 2022-06-27 14:31:30 +02:00
commit fc3c0c4beb
6 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,9 +123,16 @@
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
<hr>
{% for user in obj.intervention.users.all %}
{% if has_access %}
{% for user in obj.users.all %}
{% include 'user/includes/contact_modal_button.html' %}
{% endfor %}
{% 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' %}
</span>
{% endif %}
</td>
</tr>
</table>

7
compensation/templates/compensation/detail/eco_account/view.html
View File

@ -101,9 +101,16 @@
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
<hr>
{% if has_access %}
{% for user in obj.users.all %}
{% include 'user/includes/contact_modal_button.html' %}
{% endfor %}
{% 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' %}
</span>
{% endif %}
</td>
</tr>
</table>

9
ema/templates/ema/detail/view.html
View File

@ -87,9 +87,16 @@
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
<hr>
{% for user in obj.user.all %}
{% if has_access %}
{% for user in obj.users.all %}
{% include 'user/includes/contact_modal_button.html' %}
{% endfor %}
{% 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' %}
</span>
{% endif %}
</td>
</tr>
</table>

7
intervention/templates/intervention/detail/view.html
View File

@ -129,9 +129,16 @@
{% include 'user/includes/team_data_modal_button.html' %}
{% endfor %}
<hr>
{% if has_access %}
{% for user in obj.users.all %}
{% include 'user/includes/contact_modal_button.html' %}
{% endfor %}
{% 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' %}
</span>
{% endif %}
</td>
</tr>
</table>

BIN
locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

30
locale/de/LC_MESSAGES/django.po
View File

@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-06-21 14:11+0200\n"
"POT-Creation-Date: 2022-06-27 14:23+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -1549,6 +1549,18 @@ msgstr "Eingriffsverursacher"
msgid "Exists"
msgstr "vorhanden"
#: intervention/templates/intervention/detail/view.html:138
msgid ""
"The data must be shared with you, if you want to see which other users have "
"shared access as well."
msgstr ""
"Die Daten müssen für Sie freigegeben sein, damit Sie sehen können welche weiteren Nutzern "
"ebenfalls Zugriff hierauf haben."
#: intervention/templates/intervention/detail/view.html:140
msgid "other users"
msgstr "weitere Nutzer"
#: intervention/templates/intervention/report/report.html:58
msgid "Deductions of eco-accounts"
msgstr "Abbuchungen von Ökokonten"
@ -1871,7 +1883,7 @@ msgstr "In Zwischenablage kopiert"
#: konova/templates/konova/widgets/tree/checkbox/checkbox-tree-select.html:4
#: konova/templates/konova/widgets/tree/radio/radio-tree-select.html:4
#: templates/generic_index.html:56
#: templates/generic_index.html:58
msgid "Search"
msgstr "Suchen"
@ -2463,31 +2475,31 @@ msgstr ""
msgid "Fields with * are required."
msgstr "* sind Pflichtfelder."
#: templates/generic_index.html:39
#: templates/generic_index.html:41
msgid "New entry"
msgstr "Neuer Eintrag"
#: templates/generic_index.html:41 user/templates/user/team/index.html:22
#: templates/generic_index.html:43 user/templates/user/team/index.html:22
msgid "New"
msgstr "Neu"
#: templates/generic_index.html:56
#: templates/generic_index.html:58
msgid "Search for keywords"
msgstr "Nach Schlagwörtern suchen"
#: templates/generic_index.html:57
#: templates/generic_index.html:59
msgid "Start search"
msgstr "Starte Suche"
#: templates/generic_index.html:69
#: templates/generic_index.html:71
msgid "Results per page"
msgstr "Treffer pro Seite"
#: templates/generic_index.html:93 templates/generic_index.html:118
#: templates/generic_index.html:95 templates/generic_index.html:120
msgid "Filter"
msgstr ""
#: templates/generic_index.html:120
#: templates/generic_index.html:122
msgid "Apply filter"
msgstr "Filter anwenden"