From 6ec37dbe110198c03610a8be9ed29accb04e90a5 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Mon, 15 Nov 2021 14:00:08 +0100
Subject: [PATCH] #38 User requests

* implements 3) "Extend sharing on direct adding of users"
---
 intervention/forms/modalForms.py |  65 +++++++++++++------
 intervention/views.py            |   3 +-
 konova/autocompletes.py          |  24 +++++++
 konova/urls.py                   |   4 +-
 konova/utils/user_checks.py      |  14 ++++
 locale/de/LC_MESSAGES/django.mo  | Bin 26917 -> 27204 bytes
 locale/de/LC_MESSAGES/django.po  | 106 +++++++++++++++++--------------
 7 files changed, 147 insertions(+), 69 deletions(-)

diff --git a/intervention/forms/modalForms.py b/intervention/forms/modalForms.py
index b126f474..fb6ee083 100644
--- a/intervention/forms/modalForms.py
+++ b/intervention/forms/modalForms.py
@@ -16,10 +16,9 @@ from compensation.models import EcoAccount, EcoAccountDeduction
 from intervention.inputs import TextToClipboardInput
 from intervention.models import Revocation, RevocationDocument, Intervention
 from konova.forms import BaseModalForm
-from konova.settings import ZB_GROUP, ETS_GROUP
 from konova.utils.general import format_german_float
 from konova.utils.messenger import Messenger
-from konova.utils.user_checks import in_group
+from konova.utils.user_checks import is_default_group_only
 from user.models import UserActionLogEntry, UserAction
 
 
@@ -36,6 +35,21 @@ class ShareInterventionModalForm(BaseModalForm):
             }
         )
     )
+    user_select = forms.ModelMultipleChoiceField(
+        label=_("Add user to share with"),
+        label_suffix="",
+        help_text=_("Multiple selection possible - You can only select users which do not already have access"),
+        required=False,
+        queryset=User.objects.all(),
+        widget=autocomplete.ModelSelect2Multiple(
+            url="share-user-autocomplete",
+            attrs={
+                "data-placeholder": _("Click for selection"),
+                "data-minimum-input-length": 3,
+            },
+            forward=["users"]
+        ),
+    )
     users = forms.MultipleChoiceField(
         label=_("Shared with"),
         label_suffix="",
@@ -78,28 +92,39 @@ class ShareInterventionModalForm(BaseModalForm):
         )
 
         # Initialize users field
-        # Remove field if user is not in registration or conservation group
-        if not in_group(self.request.user, ZB_GROUP) and not in_group(self.request.user, ETS_GROUP):
-            del self.fields["users"]
-        else:
-            users = self.instance.users.all()
-            choices = []
-            for n in users:
-                choices.append(
-                    (n.id, n.username)
-                )
-            self.fields["users"].choices = choices
-            u_ids = list(users.values_list("id", flat=True))
-            self.initialize_form_field(
-                "users",
-                u_ids
+        # Disable field if user is not in registration or conservation group
+        if is_default_group_only(self.request.user):
+            self.disable_form_field("users")
+
+        self._add_user_choices_to_field()
+
+    def _add_user_choices_to_field(self):
+        """ Transforms the instance's sharing users into a list for the form field
+
+        Returns:
+
+        """
+        users = self.instance.users.all()
+        choices = []
+        for n in users:
+            choices.append(
+                (n.id, n.username)
             )
+        self.fields["users"].choices = choices
+        u_ids = list(users.values_list("id", flat=True))
+        self.initialize_form_field(
+            "users",
+            u_ids
+        )
 
     def save(self):
-        accessing_users = User.objects.filter(
-            id__in=self.cleaned_data["users"]
+        still_accessing_users = self.cleaned_data["users"]
+        new_accessing_users = list(self.cleaned_data["user_select"].values_list("id", flat=True))
+        accessing_users = still_accessing_users + new_accessing_users
+        users = User.objects.filter(
+            id__in=accessing_users
         )
-        self.instance.share_with_list(accessing_users)
+        self.instance.share_with_list(users)
 
 
 class NewRevocationModalForm(BaseModalForm):
diff --git a/intervention/views.py b/intervention/views.py
index 8c0838c9..c2a87d6e 100644
--- a/intervention/views.py
+++ b/intervention/views.py
@@ -11,7 +11,6 @@ from intervention.tables import InterventionTable
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import SimpleGeomForm, NewDocumentForm, RemoveModalForm, RecordModalForm
-from konova.sub_settings.django_settings import DEFAULT_DATE_FORMAT
 from konova.utils.documents import remove_document, get_document
 from konova.utils.generators import generate_qr_code
 from konova.utils.message_templates import INTERVENTION_INVALID, FORM_INVALID, IDENTIFIER_REPLACED, \
@@ -403,7 +402,7 @@ def create_share_view(request: HttpRequest, id: str):
 
     """
     intervention = get_object_or_404(Intervention, id=id)
-    form = ShareInterventionModalForm(request.POST or None, instance=intervention, request=request)
+    form = ShareInterventionModalForm(request.POST or None, instance=intervention, request=request, user=request.user)
     return form.process_request(
         request,
         msg_success=_("Share settings updated")
diff --git a/konova/autocompletes.py b/konova/autocompletes.py
index 36e585bd..f0fb0fe0 100644
--- a/konova/autocompletes.py
+++ b/konova/autocompletes.py
@@ -6,6 +6,7 @@ Created on: 07.12.20
 
 """
 from dal_select2.views import Select2QuerySetView
+from django.contrib.auth.models import User
 from django.db.models import Q
 
 from codelist.models import KonovaCode
@@ -60,6 +61,29 @@ class InterventionAutocomplete(Select2QuerySetView):
         return qs
 
 
+class ShareUserAutocomplete(Select2QuerySetView):
+    """ Autocomplete for intervention entries
+
+    Only returns entries that are accessible for the requesting user
+
+    """
+    def get_queryset(self):
+        if self.request.user.is_anonymous:
+            return User.objects.none()
+        exclude_user_ids = self.forwarded.get("users", [None])
+        _exclude = {"id__in": exclude_user_ids}
+        qs = User.objects.all().exclude(
+            **_exclude
+        ).order_by(
+            "username"
+        )
+        if self.q:
+            qs = qs.filter(
+                username__istartswith=self.q
+            )
+        return qs
+
+
 class KonovaCodeAutocomplete(Select2QuerySetView):
     """
     Provides simple autocomplete functionality for codes
diff --git a/konova/urls.py b/konova/urls.py
index 820de41b..1954d298 100644
--- a/konova/urls.py
+++ b/konova/urls.py
@@ -19,7 +19,8 @@ from django.urls import path, include
 
 from konova.autocompletes import EcoAccountAutocomplete, \
     InterventionAutocomplete, CompensationActionCodeAutocomplete, BiotopeCodeAutocomplete, LawCodeAutocomplete, \
-    RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete
+    RegistrationOfficeCodeAutocomplete, ConservationOfficeCodeAutocomplete, ProcessTypeCodeAutocomplete, \
+    ShareUserAutocomplete
 from konova.settings import SSO_SERVER, SSO_PUBLIC_KEY, SSO_PRIVATE_KEY, DEBUG
 from konova.sso.sso import KonovaSSOClient
 from konova.views import logout_view, home_view, remove_deadline_view
@@ -50,6 +51,7 @@ urlpatterns = [
     path("atcmplt/codes/prc-type", ProcessTypeCodeAutocomplete.as_view(), name="codes-process-type-autocomplete"),
     path("atcmplt/codes/reg-off", RegistrationOfficeCodeAutocomplete.as_view(), name="codes-registration-office-autocomplete"),
     path("atcmplt/codes/cons-off", ConservationOfficeCodeAutocomplete.as_view(), name="codes-conservation-office-autocomplete"),
+    path("atcmplt/share/u", ShareUserAutocomplete.as_view(), name="share-user-autocomplete"),
 ]
 
 if DEBUG:
diff --git a/konova/utils/user_checks.py b/konova/utils/user_checks.py
index d6b688b4..a01dadbe 100644
--- a/konova/utils/user_checks.py
+++ b/konova/utils/user_checks.py
@@ -7,6 +7,8 @@ Created on: 02.07.21
 """
 from django.contrib.auth.models import User
 
+from konova.settings import ETS_GROUP, ZB_GROUP
+
 
 def in_group(user: User, group: str) -> bool:
     """ Checks if the user is part of a group
@@ -21,3 +23,15 @@ def in_group(user: User, group: str) -> bool:
     return user.groups.filter(
         name=group
     )
+
+
+def is_default_group_only(user: User) -> bool:
+    """ Checks if the user is only part of the default group
+
+    Args:
+        user (User): The user object
+
+    Returns:
+        bool
+    """
+    return not in_group(user, ZB_GROUP) and not in_group(user, ETS_GROUP)
\ No newline at end of file
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 21785a438150888491cb8801b636a84d86bdb053..066b53d9fcd24334359875c6ffb6bd53833d6cb6 100644
GIT binary patch
delta 8676
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

delta 8455
zcmY+}2V7U>9>?(qK~O*iQF1X9*)BlCtvOK;7mggcz+H|kuciH+Wm#E{G)t3)l~z}!
z%*@QpaWflgnqg*UIl57n=1ncTpYQ+td{yVwkN5LD=bUH!o^uX(@9xh6UN{us`>JZt
za>sFhfOB;)FWk9`<(!*YL#@uOjd!jJ=ZbMD^-XoT7CYB-u0I~YJ1`-^xqMuL^YIkM
z;OP3!RmJ({3Jj*c9>bjTxlI%p)4hY0aliS6cY!;H^yMyDdyPcrs!>nI2yBg!*u(0>
zunP6b7=^P@*Dpi$|1xU4t^T^txjlB`Gpxjk)5y%+&#0OIfk_y_4|R}@f!GCuu{&y@
z-l&d?Q2k8BXq=4|aRq9k#Tbkw7|!@^8--BZrv^M^p2T44KVU<=h-BN<P4-sU2}7tC
zApf}`{HTfZQ43gun%H`C2Zm5Tgj!fB`m~}l3L5x#RH`bbcsItP_AnFG-V3#YBCL+n
zQ7e1|wc_V71UIAl-G<tt4^R^+#aj3y#$m-&_Fn^}rg}Ga#R}AWT74ku#^I=er=c=(
zzny;smAT~@glkbNdjU0}t*D9YMNQ-gR>U)?aW15ie|30;hFo-M>@VcuBAkzUm?F}>
z3B;oY%tUqE2DPF*)XK-8`kQ3+yHNw(XFh<+++(Qw*ZC-DMsJ{Qd>6ISy{LhYVHlo6
zZP6vv$^sgAsjq@+PeQ%ES?J#?)IdcTj`yPaS%~biTZYQ4Z#xD4bDvtnAJ~(6Bu|`D
zIs&zV(Wn$oLQQbCxdfH+=TX<aiCV}`?1=kN*M~K7t~|z|&L<$(`&=4@+B9UL2JGpb
za0RH>Y$)o65q5qoYUa0NIL<L2MP=+Mya_j;CiFh){sXA~51YrZH{-h#6q<6Pabs_9
z3-M;^lQ0(7VLa|ZJ*;O?D++4jO&}UIU;--jtx&1&g?c+iV<nu0%G4s%v$6(*^!~3?
z0XLvJ-iUf8cA;)OfXYOvwSR@W{v7IIEVJ{!p;r1kYUP0$-UP!@sjrFZCk}N!0ezZD
z0}6Tunj+ifMxZWSjOuVHYQR;ft$GIa)W40o?kH-arKtYSVHLc9nxM<{o}Dn%meoNm
zFg26>M^MPJhEAw~^05>4MWuEnYJiQX)b2oC_Ze!SFHjwyNA-6ZwS^&B-t}!!_ZOhH
zXe37A^epmUnZhC(H1ky$iO-^D_&RD2cVHAAL49J+qkcgK^5E!v9n?g#uo>oJD$YR-
zya6@Qx2*jG)OZ(t6tp+jP#p(ww@%bX-I#z%c?RnJ?t$uPJZcZ`LA}@WP+PSam5C=%
z_djR#O?G|<>iRvX`+Wzkp%iuF8LWmEQJJVf9<}mX7>A8;4d$Z;EJLOI5^BKm+0OBe
za#5)J+My=g*Bph)_?<}qJ~x+w2405huo#trmrxyVG~Yu#Oovb%p0M^Z<Ttdtj#aUK
zb8m&&sCq}#R`y3dtiw?&FT^0d|F=`nz*A8(o?$+MB*7J<QuaAU<7vDJuVM|X+JaSL
zI_mo{0o&k%sEO{wuJ}1>;JB9FmZxAS<GV%_G}9JX9rI8FjYJJR1J%(2)KkA4wKc0y
z9lnCvvNup$u-`m}{w+oIbJ5!WwDwA^$iHr=ML~O#f=QT-O4V(s%#1{B$v7O0Q!oub
z!ddtm>b|>Md#=WK>buSFus-!*(xQITQ4??6hWu-9n$w`Spab%^r^~T=F6xHfs0s8#
zWnic|64lWd)Iuhso{{@d8G8_Q{gbGStwCMC5q14rZOFem-baH5`UEwh!<c|4kO$iZ
zwDn%Y<`_f0z?_P_x$ZGkM)qI>ynx!$7#<AS#O#QA#`>csG~Q<?X4;9x=5yBmCTb=7
z%~I4`@jYtGuAv49ZSQ3+29?Qp)WeyCT39>OLOWVL*Yx$Y6Maz+%V0Y(7PS=<%}J=#
zPDN#A7B<FWtc?dz4_O)Nx+|y@2i?N91~5rHLA_rG=U&9Dj{N@6`+uB5J`F26IkyGR
z-~e3RnST@DuUHpLy6}MF5mf4~qxLeQt2a<h)LWB`I^PzRnO=5&6l%g#uof0$jNbq4
z6qKq`J8{vhoa42pqV~K4Y9hl?@BduXfUB@3ZbH4jAENg76zaA76?J`RH}A_>4>hrT
z^#A@JK|y;q8g=1B)Sk~r?e#L$Krf(DyB#&aJ`BX;RzGQ8#EP_sboY!jYooR*5%s#>
zf<ARTmO=&eVInR>P2@GyGqD%z;9=CBUO)|S9W}uUxn9a^qOMQJP;8D`SVvTbx}h>O
z3U%L%T=K7uAEH5f@*?V~-i7MmAZj9CnwL;}8=mL=dX2?c>N%(_9D^Y^8-sBnhT~$?
z1fE8Xvjvs8gL&+~R(^yA`4wu$XHl6cv-Y4KUI&#>Ta%31f^5`%xn=<tP#<b;#+B4V
zc*51+TGZaZiD9_kM?tALikjJ3REOnydWNA=UCoTO_7qfRGEgb)X6J{YGB*yjmD8|1
zuiq*Rr@pqAH}O|dne@F!K^+`M-FO}~(@Ut7h4uCZN<^J+gPKqdreYtA#F?0ZkD^w%
z6UX3T)P1e`c+XB3)LT)2jN^0TC@7V)QLouDRBAS(Zrp(_@B^%hfqlIRM4R!bJx@a|
zBonoTIamqvQ6I7)sOyHI_I?az>;0cVA%ceIurj`m8t8pgheuH>{sGm&Wz+!IQNLV*
z*l>!jBJzB?p{VO#Mm~0K6Q<)OOvd<rUOfjZGrpTfL3=(AHIaw08m>k?)tgaU@*!#>
z-(VE}fO^XHzr$!EA!a!0`bgA5Qp{GU>+@0f_e1~R|KliV;3=ro%tcM;ersQhTJc(Q
z9qPJQP+PUp+P7mG^<CHq%TTGWGr$`-4mHsv)WXsSkbixVI?<pGhoiQj5S4*Du?jA<
z_LUe({YBKX@fK>2ciZ_xRzHQB*iXm{<*uO~=I#T%g%+Z==B|O{pSQzpr9mm#W*2;n
z(bP|34qis3vfZtoeNYc;5o*HoP!nB(+WTiwTeTiFk=Ie5+?}Ym<}5bBNZ%mupIjZV
zF%6S31J_~~JcOB8bFeq_Jk&&nVtbs78fX)0%ihLXxEnQ*lc-Fd#hdVV)EBeb5HFLy
zEDD-=XVl*GLp>yeP^le()o~JP;034^twe3b^H$%2%ET`7AjVPu8ntpa)Vn_!)!q_6
z()&M%f@Yp_o3{lSW@l_i`>m+0coH?hM%2LXng>x6JZ<$WsFjBe^ZJcKeF^KJ?(2YB
zKmi8o{U1)D1`UPS5NDxMwgHuaop%0XR0htXp6aWpf&M^kLHXfc=Bl736ph-72G}0E
zqWW8iI{ySl`Y60YL9gEq)KmEhYQ<GYc+WyAYKsPATbzLEXgw-(TT$Qk_fYqJjIsC~
zCScG=um2R(!djs2%SWG9G=PFS7>~7aI%<YXt^Tr|--GJl5Gs{tQK`Iwnqc`+-rxPz
zF`N3$SPt(%Won8!1OG*R&M5MqN#QCDE3sjr_cz{N^Cyg_y+)Du$!vis)QeCZKZ^Pe
zJdWCer%@AHhk>}++P9#t--%lJ`*!|75&755KBYl79z(6{TdQA2Wu)9_Z*OB!nMy<r
zoQc}HHmH8`Q3Lfy4RkAJ;7DwV%gj$OhI*)PjJLuR)XKVHE1Zf+_!<V`5wp}hX?}}Z
z>3OS{p$7g1L+}~~W8he?pHQ<3mZ#lUje<I;g}Ncu>Pe^-rlIz{nYDLEU6+rVSbu9D
zjOuV0YQQ3EpNP6{veoZGWqJlC>iu6pp)m~`Fb<ES-t%jy3q!|w^=J&BzKd8+Y}Gj$
zY7^Rf9g7M5pA|i^Kk;9p3w1q=cM%$=5A~%u5H-I47(!(srTdB5{uWY>zY*7ozC=5&
zNyiC<j=PEJ{*w3OkH3`%_&fK0chse<*LAy{|CgP6jC#0_$}4taG~P`;pUAR{%Iw^H
zt2Z*$+>7!=)Em@<aveKY6ZM@qOVlCmq^@tj{u!oYBz7f8|Bdzg+x`DO<M)IA_zyoX
zSUCY(a6>A==iGf~?Jwb@R@V1Ihn|@ii9)Wuj5iaj2p#2U8>OH;h3KR4ODX78=uUh?
zByxccw%f%~4kYr3JBa#325}qbJ}0&jhY1~ZiD8`Uf-yKkjT|RE{_*oFHNB?(^-tsC
z&nVu7AL1u!=jcwoC-FGt2mLKPAJlcc?&0R)XxgR{gNgCfUm)V`x^s5jX4Dt&#&HXU
zJBi-*{J8^E_7M6CmM3%^^zi?@m!JEHFgn)jsE?A4X&(Rhsn_ksaf!ksL}!~&4?J%t
zD^T{`L*)Y^*BbAo@jffJ$8OZeSbY-Zjg$+B;goO3*N8>L7sL<5F(Qa_*~EIvHHpcT
z^^K{7I?}K{P7ko>uZEpSHf#7VBR$j;h<?Oa+U62l>>PhVx$(4TSv{8WK+3mbF!3ej
zNTM0hhWY~RKy)Ma6M2Mx|5y79-tYD&tSo8~ZxTh^+*}PDDa0lsfVL#!ZOS*{jU&>^
z9kIk3zs4})0pfPrYY{Dpqtx5#{clL27x5NRh4_WgafRqdOj3m-mUx+H%{{}hi1_=F
zLVI80K4K10ndnd4IHD-bAjZ(v2J4~kPYRtVRJ03sQ-7Y&F^;y2Sk2B&rJPT!Af6#w
z6E}``t?-bUiff28VlvT^m`gw5sG}pn;=SiTno3hnZomc@f@ASx+(|T~d=Jrz(7$H?
zP1}v56NP2OQ`Ybv)+0_6Gl>~ouVXeA;yQng-!C{Qz#HEkS0fipBr=JnR7a|f<3}Qz
zw(3N4LbtR>9nTWK60@k^Osu8+5z&MAiTIWnK+GYU5JS1<f4Bg3Ows-q5U)~6A{yI?
zTQHvb`@~-2#_>IcpRH0ElZjzOF)@#OA_yH%6Ak>OzkYmb#pnKNa=th!PZC3|u?3#7
zvS>xzMyKtpE!g}Do7rHeC_ilNgK)l;MFvsTu2X#i<wp1hksH9Tf(QyZH2#iDh;+&o
zurs0K9pVmuiT$*W4pEPyJPW(pxgF*RyGGRzl|z>n*NrMU5g%N><Z5EM@REL+C!$O8
Ox^1XjQaJGI$o~WJZ*qJ9

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 5c6f50a6..95b12183 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -9,8 +9,8 @@
 #: intervention/filters.py:26 intervention/filters.py:40
 #: intervention/filters.py:47 intervention/filters.py:48
 #: intervention/forms/forms.py:53 intervention/forms/forms.py:155
-#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:108
-#: intervention/forms/modalForms.py:121 intervention/forms/modalForms.py:134
+#: intervention/forms/forms.py:167 intervention/forms/modalForms.py:123
+#: intervention/forms/modalForms.py:136 intervention/forms/modalForms.py:149
 #: konova/forms.py:142 konova/forms.py:247 konova/forms.py:313
 #: konova/forms.py:340 konova/forms.py:350 konova/forms.py:363
 #: konova/forms.py:375 konova/forms.py:396 user/forms.py:38
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-15 11:46+0100\n"
+"POT-Creation-Date: 2021-11-15 13:40+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"
@@ -56,7 +56,7 @@ msgstr "Verantwortliche Stelle"
 #: analysis/forms.py:58 compensation/forms/forms.py:87
 #: compensation/forms/forms.py:138 intervention/forms/forms.py:63
 #: intervention/forms/forms.py:80 intervention/forms/forms.py:96
-#: intervention/forms/forms.py:112
+#: intervention/forms/forms.py:112 intervention/forms/modalForms.py:48
 msgid "Click for selection"
 msgstr "Auswählen..."
 
@@ -210,7 +210,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:276
+#: intervention/forms/modalForms.py:291
 msgid "Surface"
 msgstr "Fläche"
 
@@ -273,7 +273,7 @@ msgid "Type"
 msgstr "Typ"
 
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:24
-#: intervention/forms/modalForms.py:287 intervention/forms/modalForms.py:294
+#: intervention/forms/modalForms.py:302 intervention/forms/modalForms.py:309
 #: intervention/tables.py:88
 #: intervention/templates/intervention/detail/view.html:19
 #: konova/templates/konova/home.html:11 templates/navbars/navbar.html:22
@@ -283,7 +283,7 @@ msgstr "Eingriff"
 #: analysis/templates/analysis/reports/includes/old_data/amount.html:34
 #: compensation/tables.py:224
 #: compensation/templates/compensation/detail/eco_account/view.html:19
-#: intervention/forms/modalForms.py:260 intervention/forms/modalForms.py:267
+#: intervention/forms/modalForms.py:275 intervention/forms/modalForms.py:282
 #: konova/templates/konova/home.html:88 templates/navbars/navbar.html:34
 msgid "Eco-account"
 msgstr "Ökokonto"
@@ -350,7 +350,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:31
-#: intervention/forms/forms.py:179 intervention/forms/modalForms.py:133
+#: intervention/forms/forms.py:179 intervention/forms/modalForms.py:148
 #: intervention/templates/intervention/detail/includes/documents.html:31
 #: intervention/templates/intervention/detail/includes/payments.html:34
 #: intervention/templates/intervention/detail/includes/revocation.html:38
@@ -452,7 +452,7 @@ msgid "Due on which date"
 msgstr "Zahlung wird an diesem Datum erwartet"
 
 #: compensation/forms/modalForms.py:63 compensation/forms/modalForms.py:274
-#: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:135
+#: compensation/forms/modalForms.py:369 intervention/forms/modalForms.py:150
 #: konova/forms.py:376
 msgid "Additional comment, maximum {} letters"
 msgstr "Zusätzlicher Kommentar, maximal {} Zeichen"
@@ -477,7 +477,7 @@ msgstr "Biotoptyp"
 msgid "Select the biotope type"
 msgstr "Biotoptyp wählen"
 
-#: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:278
+#: compensation/forms/modalForms.py:155 intervention/forms/modalForms.py:293
 msgid "in m²"
 msgstr ""
 
@@ -509,7 +509,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:107
+#: intervention/forms/modalForms.py:122
 msgid "Date"
 msgstr "Datum"
 
@@ -888,14 +888,14 @@ msgstr "Zuletzt bearbeitet"
 
 #: compensation/templates/compensation/detail/compensation/view.html:79
 #: compensation/templates/compensation/detail/eco_account/view.html:82
-#: ema/templates/ema/detail/view.html:69 intervention/forms/modalForms.py:40
+#: ema/templates/ema/detail/view.html:69 intervention/forms/modalForms.py:55
 #: 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:54
+#: intervention/forms/modalForms.py:69
 #: intervention/templates/intervention/detail/includes/controls.html:15
 msgid "Share"
 msgstr "Freigabe"
@@ -1031,7 +1031,7 @@ msgstr "Kompensation {} bearbeitet"
 
 #: compensation/views/compensation_views.py:220
 #: compensation/views/eco_account_views.py:307 ema/views.py:182
-#: intervention/views.py:476
+#: intervention/views.py:475
 msgid "Log"
 msgstr "Log"
 
@@ -1041,7 +1041,7 @@ msgstr "Kompensation entfernt"
 
 #: compensation/views/compensation_views.py:264
 #: compensation/views/eco_account_views.py:459 ema/views.py:349
-#: intervention/views.py:130
+#: intervention/views.py:129
 msgid "Document added"
 msgstr "Dokument hinzugefügt"
 
@@ -1087,36 +1087,36 @@ msgid "Deduction removed"
 msgstr "Abbuchung entfernt"
 
 #: compensation/views/eco_account_views.py:328 ema/views.py:262
-#: intervention/views.py:518
+#: intervention/views.py:517
 msgid "{} unrecorded"
 msgstr "{} entzeichnet"
 
 #: compensation/views/eco_account_views.py:328 ema/views.py:262
-#: intervention/views.py:518
+#: intervention/views.py:517
 msgid "{} recorded"
 msgstr "{} verzeichnet"
 
-#: compensation/views/eco_account_views.py:529 intervention/views.py:499
+#: compensation/views/eco_account_views.py:529 intervention/views.py:498
 msgid "Deduction added"
 msgstr "Abbuchung hinzugefügt"
 
 #: compensation/views/eco_account_views.py:612 ema/views.py:517
-#: intervention/views.py:374
+#: intervention/views.py:373
 msgid "{} has already been shared with you"
 msgstr "{} wurde bereits für Sie freigegeben"
 
 #: compensation/views/eco_account_views.py:617 ema/views.py:522
-#: intervention/views.py:379
+#: intervention/views.py:378
 msgid "{} has been shared with you"
 msgstr "{} ist nun für Sie freigegeben"
 
 #: compensation/views/eco_account_views.py:624 ema/views.py:529
-#: intervention/views.py:386
+#: intervention/views.py:385
 msgid "Share link invalid"
 msgstr "Freigabelink ungültig"
 
 #: compensation/views/eco_account_views.py:647 ema/views.py:552
-#: intervention/views.py:409
+#: intervention/views.py:408
 msgid "Share settings updated"
 msgstr "Freigabe Einstellungen aktualisiert"
 
@@ -1257,46 +1257,57 @@ msgstr "Freigabelink"
 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:43
+#: intervention/forms/modalForms.py:40
+msgid "Add user to share with"
+msgstr "Nutzer direkt hinzufügen"
+
+#: intervention/forms/modalForms.py:42
+msgid ""
+"Multiple selection possible - You can only select users which do not already "
+"have access"
+msgstr ""
+"Mehrfachauswahl möglich - Sie können nur Nutzer wählen, für die der Eintrag noch nicht freigegeben wurde"
+
+#: intervention/forms/modalForms.py:58
 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:55
+#: intervention/forms/modalForms.py:70
 msgid "Share settings for {}"
 msgstr "Freigabe Einstellungen für {}"
 
-#: intervention/forms/modalForms.py:109
+#: intervention/forms/modalForms.py:124
 msgid "Date of revocation"
 msgstr "Datum des Widerspruchs"
 
-#: intervention/forms/modalForms.py:120
+#: intervention/forms/modalForms.py:135
 #: intervention/templates/intervention/detail/includes/revocation.html:35
 msgid "Document"
 msgstr "Dokument"
 
-#: intervention/forms/modalForms.py:123 konova/forms.py:364
+#: intervention/forms/modalForms.py:138 konova/forms.py:364
 msgid "Must be smaller than 15 Mb"
 msgstr "Muss kleiner als 15 Mb sein"
 
-#: intervention/forms/modalForms.py:147
+#: intervention/forms/modalForms.py:162
 #: intervention/templates/intervention/detail/includes/revocation.html:18
 msgid "Add revocation"
 msgstr "Widerspruch hinzufügen"
 
-#: intervention/forms/modalForms.py:189
+#: intervention/forms/modalForms.py:204
 msgid "Checked intervention data"
 msgstr "Eingriffsdaten geprüft"
 
-#: intervention/forms/modalForms.py:195
+#: intervention/forms/modalForms.py:210
 msgid "Checked compensations data and payments"
 msgstr "Kompensationen und Zahlungen geprüft"
 
-#: intervention/forms/modalForms.py:203
+#: intervention/forms/modalForms.py:218
 #: intervention/templates/intervention/detail/includes/controls.html:19
 msgid "Run check"
 msgstr "Prüfung vornehmen"
 
-#: intervention/forms/modalForms.py:204 konova/forms.py:449
+#: intervention/forms/modalForms.py:219 konova/forms.py:449
 msgid ""
 "I, {} {}, confirm that all necessary control steps have been performed by "
 "myself."
@@ -1304,23 +1315,23 @@ msgstr ""
 "Ich, {} {}, bestätige, dass die notwendigen Kontrollschritte durchgeführt "
 "wurden:"
 
-#: intervention/forms/modalForms.py:262
+#: intervention/forms/modalForms.py:277
 msgid "Only recorded accounts can be selected for deductions"
 msgstr "Nur verzeichnete Ökokonten können für Abbuchungen verwendet werden."
 
-#: intervention/forms/modalForms.py:289
+#: intervention/forms/modalForms.py:304
 msgid "Only shared interventions can be selected"
 msgstr "Nur freigegebene Eingriffe können gewählt werden"
 
-#: intervention/forms/modalForms.py:302
+#: intervention/forms/modalForms.py:317
 msgid "New Deduction"
 msgstr "Neue Abbuchung"
 
-#: intervention/forms/modalForms.py:303
+#: intervention/forms/modalForms.py:318
 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:336
+#: intervention/forms/modalForms.py:351
 msgid ""
 "Eco-account {} is not recorded yet. You can only deduct from recorded "
 "accounts."
@@ -1328,7 +1339,7 @@ msgstr ""
 "Ökokonto {} ist noch nicht verzeichnet. Abbuchungen können nur von "
 "verzeichneten Ökokonten erfolgen."
 
-#: intervention/forms/modalForms.py:349
+#: intervention/forms/modalForms.py:364
 msgid ""
 "The account {} has not enough surface for a deduction of {} m². There are "
 "only {} m² left"
@@ -1431,35 +1442,35 @@ msgstr ""
 "Kein Ausgleich jeglicher Art gefunden (Kompensation, Ersatzzahlung, "
 "Abbuchung)"
 
-#: intervention/views.py:80
+#: intervention/views.py:79
 msgid "Intervention {} added"
 msgstr "Eingriff {} hinzugefügt"
 
-#: intervention/views.py:244
+#: intervention/views.py:243
 msgid "This intervention has {} revocations"
 msgstr "Dem Eingriff liegen {} Widersprüche vor"
 
-#: intervention/views.py:292
+#: intervention/views.py:291
 msgid "Intervention {} edited"
 msgstr "Eingriff {} bearbeitet"
 
-#: intervention/views.py:327
+#: intervention/views.py:326
 msgid "{} removed"
 msgstr "{} entfernt"
 
-#: intervention/views.py:348
+#: intervention/views.py:347
 msgid "Revocation removed"
 msgstr "Widerspruch entfernt"
 
-#: intervention/views.py:430
+#: intervention/views.py:429
 msgid "Check performed"
 msgstr "Prüfung durchgeführt"
 
-#: intervention/views.py:452
+#: intervention/views.py:451
 msgid "Revocation added"
 msgstr "Widerspruch hinzugefügt"
 
-#: intervention/views.py:523
+#: intervention/views.py:522
 msgid "There are errors on this intervention:"
 msgstr "Es liegen Fehler in diesem Eingriff vor:"
 
@@ -3141,6 +3152,9 @@ msgstr ""
 msgid "A fontawesome icon field"
 msgstr ""
 
+#~ msgid "Share with user"
+#~ msgstr "Freigeben für Nutzer"
+
 #~ msgid "Fundings"
 #~ msgstr "Förderungen"