#101 Team sharing form
* adds team sharing field to share form * splits sharing logic into user based and teams based * adds TeamAdmin for admin backend * adds validity check on Team name -> only unused names shall be valid
This commit is contained in:
Binary file not shown.
@@ -7,8 +7,8 @@
|
||||
#: compensation/forms/modalForms.py:47 compensation/forms/modalForms.py:63
|
||||
#: compensation/forms/modalForms.py:356 compensation/forms/modalForms.py:463
|
||||
#: intervention/forms/forms.py:54 intervention/forms/forms.py:156
|
||||
#: intervention/forms/forms.py:168 intervention/forms/modalForms.py:127
|
||||
#: intervention/forms/modalForms.py:140 intervention/forms/modalForms.py:153
|
||||
#: intervention/forms/forms.py:168 intervention/forms/modalForms.py:148
|
||||
#: intervention/forms/modalForms.py:161 intervention/forms/modalForms.py:174
|
||||
#: konova/filters/mixins.py:53 konova/filters/mixins.py:54
|
||||
#: konova/filters/mixins.py:81 konova/filters/mixins.py:82
|
||||
#: konova/filters/mixins.py:94 konova/filters/mixins.py:95
|
||||
@@ -26,7 +26,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2022-02-17 13:42+0100\n"
|
||||
"POT-Creation-Date: 2022-02-18 09:35+0100\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"
|
||||
@@ -64,7 +64,7 @@ msgstr "Verantwortliche Stelle"
|
||||
#: compensation/forms/forms.py:165 intervention/forms/forms.py:64
|
||||
#: intervention/forms/forms.py:81 intervention/forms/forms.py:97
|
||||
#: intervention/forms/forms.py:113 intervention/forms/modalForms.py:49
|
||||
#: user/forms.py:196
|
||||
#: intervention/forms/modalForms.py:63 user/forms.py:196
|
||||
msgid "Click for selection"
|
||||
msgstr "Auswählen..."
|
||||
|
||||
@@ -221,7 +221,7 @@ msgstr "Abbuchungen"
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/states-before.html:36
|
||||
#: ema/templates/ema/detail/includes/states-after.html:36
|
||||
#: ema/templates/ema/detail/includes/states-before.html:36
|
||||
#: intervention/forms/modalForms.py:338
|
||||
#: intervention/forms/modalForms.py:359
|
||||
msgid "Surface"
|
||||
msgstr "Fläche"
|
||||
|
||||
@@ -284,8 +284,8 @@ msgid "Type"
|
||||
msgstr "Typ"
|
||||
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:24
|
||||
#: compensation/tables.py:89 intervention/forms/modalForms.py:349
|
||||
#: intervention/forms/modalForms.py:356 intervention/tables.py:88
|
||||
#: compensation/tables.py:89 intervention/forms/modalForms.py:370
|
||||
#: intervention/forms/modalForms.py:377 intervention/tables.py:88
|
||||
#: intervention/templates/intervention/detail/view.html:19
|
||||
#: konova/templates/konova/includes/quickstart/interventions.html:4
|
||||
#: templates/navbars/navbar.html:22
|
||||
@@ -295,7 +295,7 @@ msgstr "Eingriff"
|
||||
#: analysis/templates/analysis/reports/includes/old_data/amount.html:34
|
||||
#: compensation/tables.py:266
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:20
|
||||
#: intervention/forms/modalForms.py:322 intervention/forms/modalForms.py:329
|
||||
#: intervention/forms/modalForms.py:343 intervention/forms/modalForms.py:350
|
||||
#: konova/templates/konova/includes/quickstart/ecoaccounts.html:4
|
||||
#: templates/navbars/navbar.html:34
|
||||
msgid "Eco-account"
|
||||
@@ -364,7 +364,7 @@ msgstr "Kompensation XY; Flur ABC"
|
||||
#: ema/templates/ema/detail/includes/actions.html:34
|
||||
#: ema/templates/ema/detail/includes/deadlines.html:34
|
||||
#: ema/templates/ema/detail/includes/documents.html:34
|
||||
#: intervention/forms/forms.py:180 intervention/forms/modalForms.py:152
|
||||
#: intervention/forms/forms.py:180 intervention/forms/modalForms.py:173
|
||||
#: intervention/templates/intervention/detail/includes/documents.html:34
|
||||
#: intervention/templates/intervention/detail/includes/payments.html:34
|
||||
#: intervention/templates/intervention/detail/includes/revocation.html:38
|
||||
@@ -484,7 +484,7 @@ msgid "Due on which date"
|
||||
msgstr "Zahlung wird an diesem Datum erwartet"
|
||||
|
||||
#: compensation/forms/modalForms.py:64 compensation/forms/modalForms.py:357
|
||||
#: intervention/forms/modalForms.py:154 konova/forms.py:395
|
||||
#: intervention/forms/modalForms.py:175 konova/forms.py:395
|
||||
msgid "Additional comment, maximum {} letters"
|
||||
msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
|
||||
|
||||
@@ -512,7 +512,7 @@ msgstr "Zusatzbezeichnung"
|
||||
msgid "Select an additional biotope type"
|
||||
msgstr "Zusatzbezeichnung wählen"
|
||||
|
||||
#: compensation/forms/modalForms.py:197 intervention/forms/modalForms.py:340
|
||||
#: compensation/forms/modalForms.py:197 intervention/forms/modalForms.py:361
|
||||
msgid "in m²"
|
||||
msgstr ""
|
||||
|
||||
@@ -540,7 +540,7 @@ msgstr "Fristart wählen"
|
||||
#: compensation/templates/compensation/detail/compensation/includes/deadlines.html:31
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/deadlines.html:31
|
||||
#: ema/templates/ema/detail/includes/deadlines.html:31
|
||||
#: intervention/forms/modalForms.py:126
|
||||
#: intervention/forms/modalForms.py:147
|
||||
msgid "Date"
|
||||
msgstr "Datum"
|
||||
|
||||
@@ -752,7 +752,7 @@ msgstr "Menge"
|
||||
#: intervention/templates/intervention/detail/includes/documents.html:39
|
||||
#: intervention/templates/intervention/detail/includes/payments.html:39
|
||||
#: intervention/templates/intervention/detail/includes/revocation.html:43
|
||||
#: templates/log.html:10 user/templates/user/team/index.html:33
|
||||
#: templates/log.html:10 user/templates/user/team/index.html:32
|
||||
msgid "Action"
|
||||
msgstr "Aktionen"
|
||||
|
||||
@@ -1000,14 +1000,14 @@ msgstr "Zuletzt bearbeitet"
|
||||
|
||||
#: compensation/templates/compensation/detail/compensation/view.html:100
|
||||
#: compensation/templates/compensation/detail/eco_account/view.html:83
|
||||
#: ema/templates/ema/detail/view.html:76 intervention/forms/modalForms.py:56
|
||||
#: ema/templates/ema/detail/view.html:76 intervention/forms/modalForms.py:70
|
||||
#: intervention/templates/intervention/detail/view.html:116
|
||||
msgid "Shared with"
|
||||
msgstr "Freigegeben für"
|
||||
|
||||
#: compensation/templates/compensation/detail/eco_account/includes/controls.html:15
|
||||
#: ema/templates/ema/detail/includes/controls.html:15
|
||||
#: intervention/forms/modalForms.py:70
|
||||
#: intervention/forms/modalForms.py:84
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:15
|
||||
msgid "Share"
|
||||
msgstr "Freigabe"
|
||||
@@ -1325,10 +1325,22 @@ msgid "Send this link to users who you want to have writing access on the data"
|
||||
msgstr "Andere Nutzer erhalten über diesen Link Zugriff auf die Daten"
|
||||
|
||||
#: intervention/forms/modalForms.py:41
|
||||
msgid "Add team to share with"
|
||||
msgstr "Team hinzufügen"
|
||||
|
||||
#: intervention/forms/modalForms.py:43
|
||||
msgid ""
|
||||
"Multiple selection possible - You can only select teams which do not already "
|
||||
"have access."
|
||||
msgstr ""
|
||||
"Mehrfachauswahl möglich - Sie können nur Teams wählen, für die der Eintrag "
|
||||
"noch nicht freigegeben wurde."
|
||||
|
||||
#: intervention/forms/modalForms.py:55
|
||||
msgid "Add user to share with"
|
||||
msgstr "Nutzer direkt hinzufügen"
|
||||
|
||||
#: intervention/forms/modalForms.py:43
|
||||
#: intervention/forms/modalForms.py:57
|
||||
msgid ""
|
||||
"Multiple selection possible - You can only select users which do not already "
|
||||
"have access. Enter the full username."
|
||||
@@ -1336,46 +1348,46 @@ msgstr ""
|
||||
"Mehrfachauswahl möglich - Sie können nur Nutzer wählen, für die der Eintrag "
|
||||
"noch nicht freigegeben wurde. Geben Sie den ganzen Nutzernamen an."
|
||||
|
||||
#: intervention/forms/modalForms.py:59
|
||||
#: intervention/forms/modalForms.py:73
|
||||
msgid "Remove check to remove access for this user"
|
||||
msgstr "Wählen Sie die Nutzer ab, die keinen Zugriff mehr haben sollen"
|
||||
|
||||
#: intervention/forms/modalForms.py:71
|
||||
#: intervention/forms/modalForms.py:85
|
||||
msgid "Share settings for {}"
|
||||
msgstr "Freigabe Einstellungen für {}"
|
||||
|
||||
#: intervention/forms/modalForms.py:128
|
||||
#: intervention/forms/modalForms.py:149
|
||||
msgid "Date of revocation"
|
||||
msgstr "Datum des Widerspruchs"
|
||||
|
||||
#: intervention/forms/modalForms.py:139
|
||||
#: intervention/forms/modalForms.py:160
|
||||
#: intervention/templates/intervention/detail/includes/revocation.html:35
|
||||
msgid "Document"
|
||||
msgstr "Dokument"
|
||||
|
||||
#: intervention/forms/modalForms.py:142
|
||||
#: intervention/forms/modalForms.py:163
|
||||
msgid "Must be smaller than 15 Mb"
|
||||
msgstr "Muss kleiner als 15 Mb sein"
|
||||
|
||||
#: intervention/forms/modalForms.py:167
|
||||
#: intervention/forms/modalForms.py:188
|
||||
#: intervention/templates/intervention/detail/includes/revocation.html:18
|
||||
msgid "Add revocation"
|
||||
msgstr "Widerspruch hinzufügen"
|
||||
|
||||
#: intervention/forms/modalForms.py:224
|
||||
#: intervention/forms/modalForms.py:245
|
||||
msgid "Checked intervention data"
|
||||
msgstr "Eingriffsdaten geprüft"
|
||||
|
||||
#: intervention/forms/modalForms.py:230
|
||||
#: intervention/forms/modalForms.py:251
|
||||
msgid "Checked compensations data and payments"
|
||||
msgstr "Kompensationen und Zahlungen geprüft"
|
||||
|
||||
#: intervention/forms/modalForms.py:239
|
||||
#: intervention/forms/modalForms.py:260
|
||||
#: intervention/templates/intervention/detail/includes/controls.html:19
|
||||
msgid "Run check"
|
||||
msgstr "Prüfung vornehmen"
|
||||
|
||||
#: intervention/forms/modalForms.py:240 konova/forms.py:514
|
||||
#: intervention/forms/modalForms.py:261 konova/forms.py:514
|
||||
msgid ""
|
||||
"I, {} {}, confirm that all necessary control steps have been performed by "
|
||||
"myself."
|
||||
@@ -1383,23 +1395,23 @@ msgstr ""
|
||||
"Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
|
||||
"wurden:"
|
||||
|
||||
#: intervention/forms/modalForms.py:324
|
||||
#: intervention/forms/modalForms.py:345
|
||||
msgid "Only recorded accounts can be selected for deductions"
|
||||
msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
|
||||
|
||||
#: intervention/forms/modalForms.py:351
|
||||
#: intervention/forms/modalForms.py:372
|
||||
msgid "Only shared interventions can be selected"
|
||||
msgstr "Nur freigegebene Eingriffe können gewählt werden"
|
||||
|
||||
#: intervention/forms/modalForms.py:364
|
||||
#: intervention/forms/modalForms.py:385
|
||||
msgid "New Deduction"
|
||||
msgstr "Neue Abbuchung"
|
||||
|
||||
#: intervention/forms/modalForms.py:365
|
||||
#: intervention/forms/modalForms.py:386
|
||||
msgid "Enter the information for a new deduction from a chosen eco-account"
|
||||
msgstr "Geben Sie die Informationen für eine neue Abbuchung ein."
|
||||
|
||||
#: intervention/forms/modalForms.py:408
|
||||
#: intervention/forms/modalForms.py:429
|
||||
msgid ""
|
||||
"Eco-account {} is not recorded yet. You can only deduct from recorded "
|
||||
"accounts."
|
||||
@@ -1407,7 +1419,7 @@ msgstr ""
|
||||
"Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
|
||||
"verzeichneten Ökokonten erfolgen."
|
||||
|
||||
#: intervention/forms/modalForms.py:418
|
||||
#: intervention/forms/modalForms.py:439
|
||||
msgid ""
|
||||
"The account {} has not enough surface for a deduction of {} m². There are "
|
||||
"only {} m² left"
|
||||
@@ -2273,7 +2285,7 @@ msgstr "* sind Pflichtfelder."
|
||||
msgid "New entry"
|
||||
msgstr "Neuer Eintrag"
|
||||
|
||||
#: templates/generic_index.html:41 user/templates/user/team/index.html:23
|
||||
#: templates/generic_index.html:41 user/templates/user/team/index.html:22
|
||||
msgid "New"
|
||||
msgstr "Neu"
|
||||
|
||||
@@ -2406,7 +2418,7 @@ msgstr "Neue Tokens müssen durch Administratoren freigeschaltet werden!"
|
||||
msgid "Team name"
|
||||
msgstr "Team Name"
|
||||
|
||||
#: user/forms.py:179 user/templates/user/team/index.html:31
|
||||
#: user/forms.py:179 user/templates/user/team/index.html:30
|
||||
msgid "Description"
|
||||
msgstr "Beschreibung"
|
||||
|
||||
@@ -2434,19 +2446,23 @@ msgstr ""
|
||||
"Sie werden standardmäßig der Administrator dieses Teams. Sie müssen sich "
|
||||
"selbst nicht zur Liste der Mitglieder hinzufügen."
|
||||
|
||||
#: user/forms.py:230
|
||||
#: user/forms.py:218 user/forms.py:279
|
||||
msgid "Name already taken. Try another."
|
||||
msgstr "Name bereits vergeben. Probieren Sie einen anderen."
|
||||
|
||||
#: user/forms.py:249
|
||||
msgid "Admin"
|
||||
msgstr "Administrator"
|
||||
|
||||
#: user/forms.py:231
|
||||
#: user/forms.py:250
|
||||
msgid "Administrators manage team details and members"
|
||||
msgstr "Administratoren verwalten die Teamdaten und Mitglieder"
|
||||
|
||||
#: user/forms.py:244
|
||||
#: user/forms.py:263
|
||||
msgid "Selected admin ({}) needs to be a member of this team."
|
||||
msgstr "Gewählter Administrator ({}) muss ein Mitglied des Teams sein."
|
||||
|
||||
#: user/forms.py:256 user/templates/user/team/index.html:52
|
||||
#: user/forms.py:291 user/templates/user/team/index.html:51
|
||||
msgid "Edit team"
|
||||
msgstr "Team bearbeiten"
|
||||
|
||||
@@ -2466,7 +2482,7 @@ msgstr "Gelöscht"
|
||||
msgid "Show contact data"
|
||||
msgstr "Zeige Kontaktdaten"
|
||||
|
||||
#: user/templates/user/index.html:13 user/templates/user/team/index.html:30
|
||||
#: user/templates/user/index.html:13 user/templates/user/team/index.html:29
|
||||
msgid "Name"
|
||||
msgstr ""
|
||||
|
||||
@@ -2515,20 +2531,20 @@ msgstr ""
|
||||
msgid "Manage teams"
|
||||
msgstr ""
|
||||
|
||||
#: user/templates/user/index.html:69 user/templates/user/team/index.html:19
|
||||
#: user/templates/user/index.html:69 user/templates/user/team/index.html:18
|
||||
#: user/views.py:142
|
||||
msgid "Teams"
|
||||
msgstr ""
|
||||
|
||||
#: user/templates/user/team/index.html:21
|
||||
#: user/templates/user/team/index.html:20
|
||||
msgid "Add new team"
|
||||
msgstr "Neues Team hinzufügen"
|
||||
|
||||
#: user/templates/user/team/index.html:32
|
||||
#: user/templates/user/team/index.html:31
|
||||
msgid "Members"
|
||||
msgstr "Mitglieder"
|
||||
|
||||
#: user/templates/user/team/index.html:55
|
||||
#: user/templates/user/team/index.html:54
|
||||
msgid "Remove team"
|
||||
msgstr "Team entfernen"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user