From bee6aaaebf5188b733b80580390215f547cb8d9d Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Thu, 21 Oct 2021 09:37:34 +0200
Subject: [PATCH 1/2] Organisation bei der Erstellung optional verifizieren
 #313

---
 messages.pot                                  |  89 +++++++++++-------
 project/forms/admin_unit.py                   |  27 +++++-
 project/jinja_filters.py                      |  23 +----
 project/requests.py                           |   7 +-
 project/templates/admin_unit/create.html      |  16 ++++
 .../translations/de/LC_MESSAGES/messages.mo   | Bin 32624 -> 33148 bytes
 .../translations/de/LC_MESSAGES/messages.po   |  89 +++++++++++-------
 .../translations/en/LC_MESSAGES/messages.mo   | Bin 3489 -> 3489 bytes
 .../translations/en/LC_MESSAGES/messages.po   |  89 +++++++++++-------
 project/views/admin_unit.py                   |  52 +++++++++-
 project/views/manage.py                       |  25 ++---
 project/views/utils.py                        |  35 ++++++-
 tests/conftest.py                             |   1 +
 tests/views/test_admin_unit.py                |  32 +++++++
 14 files changed, 335 insertions(+), 150 deletions(-)

diff --git a/messages.pot b/messages.pot
index 144a7d0..58eaf01 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-14 14:32+0200\n"
+"POT-Creation-Date: 2021-10-20 23:30+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"
@@ -207,7 +207,7 @@ msgstr ""
 #: project/forms/admin.py:12 project/templates/_macros.html:1409
 #: project/templates/layout.html:316
 #: project/templates/widget/event_suggestion/create.html:204
-#: project/views/admin_unit.py:50 project/views/root.py:58
+#: project/views/admin_unit.py:73 project/views/root.py:58
 msgid "Contact"
 msgstr ""
 
@@ -277,37 +277,37 @@ msgstr ""
 msgid "Update organization"
 msgstr ""
 
-#: project/forms/admin_unit.py:14 project/forms/event_place.py:12
+#: project/forms/admin_unit.py:15 project/forms/event_place.py:12
 #: project/forms/organizer.py:12
 msgid "Street"
 msgstr ""
 
-#: project/forms/admin_unit.py:15 project/forms/event_place.py:13
+#: project/forms/admin_unit.py:16 project/forms/event_place.py:13
 #: project/forms/organizer.py:13
 msgid "Postal code"
 msgstr ""
 
-#: project/forms/admin_unit.py:16 project/forms/event_place.py:14
+#: project/forms/admin_unit.py:17 project/forms/event_place.py:14
 #: project/forms/organizer.py:14
 msgid "City"
 msgstr ""
 
-#: project/forms/admin_unit.py:17 project/forms/event_place.py:15
+#: project/forms/admin_unit.py:18 project/forms/event_place.py:15
 #: project/forms/organizer.py:15
 msgid "State"
 msgstr ""
 
-#: project/forms/admin_unit.py:19 project/forms/event_place.py:17
+#: project/forms/admin_unit.py:20 project/forms/event_place.py:17
 #: project/forms/organizer.py:17
 msgid "Latitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:22 project/forms/event_place.py:20
+#: project/forms/admin_unit.py:23 project/forms/event_place.py:20
 #: project/forms/organizer.py:20
 msgid "Longitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:28 project/forms/event.py:36
+#: project/forms/admin_unit.py:29 project/forms/event.py:36
 #: project/forms/event.py:65 project/forms/event.py:398
 #: project/forms/event_place.py:25 project/forms/event_place.py:50
 #: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
@@ -319,25 +319,25 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: project/forms/admin_unit.py:31
+#: project/forms/admin_unit.py:32
 msgid "Short name"
 msgstr ""
 
-#: project/forms/admin_unit.py:32
+#: project/forms/admin_unit.py:33
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:40 project/templates/_macros.html:1545
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1545
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
-#: project/forms/admin_unit.py:46 project/forms/event.py:57
+#: project/forms/admin_unit.py:47 project/forms/event.py:57
 #: project/forms/event.py:95 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr ""
 
-#: project/forms/admin_unit.py:47 project/forms/admin_unit_member.py:11
+#: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:58 project/forms/event_suggestion.py:38
 #: project/forms/organizer.py:27 project/templates/_macros.html:262
@@ -345,44 +345,62 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: project/forms/admin_unit.py:48 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:59
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
 #: project/templates/_macros.html:315
 msgid "Phone"
 msgstr ""
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:60
+#: project/forms/admin_unit.py:50 project/forms/event.py:60
 #: project/forms/organizer.py:29 project/templates/_macros.html:323
 msgid "Fax"
 msgstr ""
 
-#: project/forms/admin_unit.py:50 project/forms/organizer.py:30
+#: project/forms/admin_unit.py:51 project/forms/organizer.py:30
 msgid "Logo"
 msgstr ""
 
-#: project/forms/admin_unit.py:63 project/templates/admin_unit/create.html:5
+#: project/forms/admin_unit.py:65
+msgid "Verify new organization"
+msgstr ""
+
+#: project/forms/admin_unit.py:66
+msgid "If set, events of the new organization are publicly visible."
+msgstr ""
+
+#: project/forms/admin_unit.py:72 project/forms/reference_request.py:86
+msgid "Verify reference requests automatically"
+msgstr ""
+
+#: project/forms/admin_unit.py:73
+msgid ""
+"If set, all upcoming reference requests of the new organization are "
+"verified automatically."
+msgstr ""
+
+#: project/forms/admin_unit.py:84 project/templates/admin_unit/create.html:5
 #: project/templates/admin_unit/create.html:22
 #: project/templates/manage/admin_units.html:27
 msgid "Create organization"
 msgstr ""
 
-#: project/forms/admin_unit.py:67 project/forms/admin_unit.py:90
+#: project/forms/admin_unit.py:92 project/forms/admin_unit.py:115
 msgid "Update settings"
 msgstr ""
 
-#: project/forms/admin_unit.py:71
+#: project/forms/admin_unit.py:96
 msgid "Font"
 msgstr ""
 
-#: project/forms/admin_unit.py:73
+#: project/forms/admin_unit.py:98
 msgid "Background Color"
 msgstr ""
 
-#: project/forms/admin_unit.py:79
+#: project/forms/admin_unit.py:104
 msgid "Primary Color"
 msgstr ""
 
-#: project/forms/admin_unit.py:85
+#: project/forms/admin_unit.py:110
 msgid "Link Color"
 msgstr ""
 
@@ -1099,10 +1117,6 @@ msgstr ""
 msgid "Choose why you rejected the request."
 msgstr ""
 
-#: project/forms/reference_request.py:86
-msgid "Verify reference requests automatically"
-msgstr ""
-
 #: project/forms/reference_request.py:90
 msgid "Save review"
 msgstr ""
@@ -1499,6 +1513,11 @@ msgstr ""
 msgid "Additional information"
 msgstr ""
 
+#: project/templates/admin_unit/create.html:71
+#, python-format
+msgid "Relation to %(admin_unit_name)s"
+msgstr ""
+
 #: project/templates/admin_unit/invite_member.html:6
 #: project/templates/manage/members.html:12
 msgid "Invite user"
@@ -1910,21 +1929,21 @@ msgstr ""
 msgid "User successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:46
+#: project/views/admin_unit.py:69
 msgid ""
 "Organizations cannot currently be created. The project is in a closed "
 "test phase. If you are interested, you can contact us."
 msgstr ""
 
-#: project/views/admin_unit.py:79
+#: project/views/admin_unit.py:115
 msgid "Organization successfully created"
 msgstr ""
 
-#: project/views/admin_unit.py:105
+#: project/views/admin_unit.py:145
 msgid "AdminUnit successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:127
+#: project/views/admin_unit.py:167
 msgid "Organization invitation accepted"
 msgstr ""
 
@@ -2115,22 +2134,22 @@ msgid ""
 "verified automatically."
 msgstr ""
 
-#: project/views/utils.py:54
+#: project/views/utils.py:76
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
 msgstr ""
 
-#: project/views/utils.py:105
+#: project/views/utils.py:127
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr ""
 
-#: project/views/utils.py:112
+#: project/views/utils.py:134
 msgid "Show"
 msgstr ""
 
-#: project/views/utils.py:119
+#: project/views/utils.py:141
 msgid "You do not have permission for this action"
 msgstr ""
 
diff --git a/project/forms/admin_unit.py b/project/forms/admin_unit.py
index be6af9b..7e91548 100644
--- a/project/forms/admin_unit.py
+++ b/project/forms/admin_unit.py
@@ -1,13 +1,14 @@
 from flask_babelex import lazy_gettext
 from flask_wtf import FlaskForm
 from wtforms import DecimalField, FormField, StringField, SubmitField
+from wtforms.fields.core import BooleanField
 from wtforms.fields.html5 import EmailField, TelField, URLField
 from wtforms.validators import DataRequired, Length, Optional, Regexp
 from wtforms.widgets.html5 import ColorInput
 
 from project.forms.common import Base64ImageForm
 from project.forms.widgets import HTML5StringField
-from project.models import Image, Location
+from project.models import AdminUnitRelation, Image, Location
 
 
 class AdminUnitLocationForm(FlaskForm):
@@ -59,9 +60,33 @@ class BaseAdminUnitForm(FlaskForm):
             field.populate_obj(obj, name)
 
 
+class AdminUnitRelationForm(FlaskForm):
+    verify = BooleanField(
+        lazy_gettext("Verify new organization"),
+        description=lazy_gettext(
+            "If set, events of the new organization are publicly visible."
+        ),
+        validators=[Optional()],
+    )
+    auto_verify_event_reference_requests = BooleanField(
+        lazy_gettext("Verify reference requests automatically"),
+        description=lazy_gettext(
+            "If set, all upcoming reference requests of the new organization are verified automatically."
+        ),
+        validators=[Optional()],
+    )
+
+
 class CreateAdminUnitForm(BaseAdminUnitForm):
+    embedded_relation = FormField(
+        AdminUnitRelationForm, default=lambda: AdminUnitRelation()
+    )
     submit = SubmitField(lazy_gettext("Create organization"))
 
+    def populate_obj(self, obj):
+        super().populate_obj(obj)
+        delattr(obj, "embedded_relation")
+
 
 class UpdateAdminUnitForm(BaseAdminUnitForm):
     submit = SubmitField(lazy_gettext("Update settings"))
diff --git a/project/jinja_filters.py b/project/jinja_filters.py
index 9a5729f..06c0bae 100644
--- a/project/jinja_filters.py
+++ b/project/jinja_filters.py
@@ -1,7 +1,7 @@
 import os
 from urllib.parse import quote_plus
 
-from flask import request, url_for
+from flask import url_for
 
 from project import app
 from project.utils import (
@@ -60,6 +60,8 @@ app.jinja_env.globals.update(
 
 @app.context_processor
 def get_context_processors():
+    from project.views.utils import get_current_admin_unit
+
     def get_manage_menu_options(admin_unit):
         from project.access import has_access
         from project.services.event_suggestion import get_event_reviews_badge_query
@@ -80,25 +82,6 @@ def get_context_processors():
             "reference_requests_incoming_badge": reference_requests_incoming_badge,
         }
 
-    def get_current_admin_unit():
-        from flask_security import current_user
-
-        from project.access import get_admin_units_for_manage
-        from project.views.utils import get_manage_admin_unit_from_request
-
-        admin_unit = None
-
-        if current_user.is_authenticated:
-            admin_unit = get_manage_admin_unit_from_request(request)
-
-            if not admin_unit:
-                admin_units = get_admin_units_for_manage()
-
-                if len(admin_units) > 0:
-                    admin_unit = admin_units[0]
-
-        return admin_unit
-
     return dict(
         current_admin_unit=get_current_admin_unit(),
         get_manage_menu_options=get_manage_menu_options,
diff --git a/project/requests.py b/project/requests.py
index 64ae4a5..f3b3c2f 100644
--- a/project/requests.py
+++ b/project/requests.py
@@ -8,9 +8,10 @@ from project import app
 
 @app.after_request
 def set_manage_admin_unit_cookie(response):
-    manage_admin_unit_id = getattr(g, "manage_admin_unit_id", 0)
-    if manage_admin_unit_id > 0:
-        encoded = encode_cookie(str(manage_admin_unit_id))
+    admin_unit = getattr(g, "manage_admin_unit", None)
+
+    if admin_unit:
+        encoded = encode_cookie(str(admin_unit.id))
         response.set_cookie(
             "manage_admin_unit_id",
             value=encoded,
diff --git a/project/templates/admin_unit/create.html b/project/templates/admin_unit/create.html
index de2e844..d0e077e 100644
--- a/project/templates/admin_unit/create.html
+++ b/project/templates/admin_unit/create.html
@@ -65,6 +65,22 @@
     </div>
   </div>
 
+  {% if embedded_relation_enabled %}
+  <div class="card mb-4">
+    <div class="card-header">
+      {{ _('Relation to %(admin_unit_name)s', admin_unit_name=current_admin_unit.name) }}
+    </div>
+    <div class="card-body">
+      {% if current_admin_unit.can_verify_other %}
+        {{ render_field_with_errors(form.embedded_relation.verify, ri="switch") }}
+      {% endif %}
+      {% if current_admin_unit.incoming_reference_requests_allowed %}
+        {{ render_field_with_errors(form.embedded_relation.auto_verify_event_reference_requests, ri="switch") }}
+      {% endif %}
+    </div>
+  </div>
+  {% endif %}
+
   {{ render_field(form.submit) }}
 </form>
 
diff --git a/project/translations/de/LC_MESSAGES/messages.mo b/project/translations/de/LC_MESSAGES/messages.mo
index 6f1881f8844249ed88bb437fe6d20a17e9dcc8c6..313ea3d5d7f5066390fa258dcefe3ac70891ad23 100644
GIT binary patch
delta 7847
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

delta 7500
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
RrhoMM?xRDCo)i@L{|}3JcF_O;

diff --git a/project/translations/de/LC_MESSAGES/messages.po b/project/translations/de/LC_MESSAGES/messages.po
index 86b2f96..dd94600 100644
--- a/project/translations/de/LC_MESSAGES/messages.po
+++ b/project/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-14 14:32+0200\n"
+"POT-Creation-Date: 2021-10-20 23:30+0200\n"
 "PO-Revision-Date: 2020-06-07 18:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -208,7 +208,7 @@ msgstr "Impressum"
 #: project/forms/admin.py:12 project/templates/_macros.html:1409
 #: project/templates/layout.html:316
 #: project/templates/widget/event_suggestion/create.html:204
-#: project/views/admin_unit.py:50 project/views/root.py:58
+#: project/views/admin_unit.py:73 project/views/root.py:58
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -286,37 +286,37 @@ msgstr ""
 msgid "Update organization"
 msgstr "Organisation aktualisieren"
 
-#: project/forms/admin_unit.py:14 project/forms/event_place.py:12
+#: project/forms/admin_unit.py:15 project/forms/event_place.py:12
 #: project/forms/organizer.py:12
 msgid "Street"
 msgstr "Straße"
 
-#: project/forms/admin_unit.py:15 project/forms/event_place.py:13
+#: project/forms/admin_unit.py:16 project/forms/event_place.py:13
 #: project/forms/organizer.py:13
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: project/forms/admin_unit.py:16 project/forms/event_place.py:14
+#: project/forms/admin_unit.py:17 project/forms/event_place.py:14
 #: project/forms/organizer.py:14
 msgid "City"
 msgstr "Stadt/Ort"
 
-#: project/forms/admin_unit.py:17 project/forms/event_place.py:15
+#: project/forms/admin_unit.py:18 project/forms/event_place.py:15
 #: project/forms/organizer.py:15
 msgid "State"
 msgstr "Bundesland"
 
-#: project/forms/admin_unit.py:19 project/forms/event_place.py:17
+#: project/forms/admin_unit.py:20 project/forms/event_place.py:17
 #: project/forms/organizer.py:17
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: project/forms/admin_unit.py:22 project/forms/event_place.py:20
+#: project/forms/admin_unit.py:23 project/forms/event_place.py:20
 #: project/forms/organizer.py:20
 msgid "Longitude"
 msgstr "Längengrad"
 
-#: project/forms/admin_unit.py:28 project/forms/event.py:36
+#: project/forms/admin_unit.py:29 project/forms/event.py:36
 #: project/forms/event.py:65 project/forms/event.py:398
 #: project/forms/event_place.py:25 project/forms/event_place.py:50
 #: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
@@ -328,28 +328,28 @@ msgstr "Längengrad"
 msgid "Name"
 msgstr "Name"
 
-#: project/forms/admin_unit.py:31
+#: project/forms/admin_unit.py:32
 msgid "Short name"
 msgstr "Kurzname"
 
-#: project/forms/admin_unit.py:32
+#: project/forms/admin_unit.py:33
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 "Der Kurzname wird verwendet, um die Veranstaltungen der Organisation "
 "eindeutig zu identifizieren. Der Kurzname darf nur Buchstaben, Nummern "
 "und Unterstriche enthalten."
 
-#: project/forms/admin_unit.py:40 project/templates/_macros.html:1545
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1545
 msgid "Short name must contain only letters numbers or underscore"
 msgstr "Der Kurzname darf nur Buchstaben, Nummern und Unterstriche enthalten"
 
-#: project/forms/admin_unit.py:46 project/forms/event.py:57
+#: project/forms/admin_unit.py:47 project/forms/event.py:57
 #: project/forms/event.py:95 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr "Link URL"
 
-#: project/forms/admin_unit.py:47 project/forms/admin_unit_member.py:11
+#: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:58 project/forms/event_suggestion.py:38
 #: project/forms/organizer.py:27 project/templates/_macros.html:262
@@ -357,44 +357,62 @@ msgstr "Link URL"
 msgid "Email"
 msgstr "Email"
 
-#: project/forms/admin_unit.py:48 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:59
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
 #: project/templates/_macros.html:315
 msgid "Phone"
 msgstr "Telefon"
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:60
+#: project/forms/admin_unit.py:50 project/forms/event.py:60
 #: project/forms/organizer.py:29 project/templates/_macros.html:323
 msgid "Fax"
 msgstr "Fax"
 
-#: project/forms/admin_unit.py:50 project/forms/organizer.py:30
+#: project/forms/admin_unit.py:51 project/forms/organizer.py:30
 msgid "Logo"
 msgstr "Logo"
 
-#: project/forms/admin_unit.py:63 project/templates/admin_unit/create.html:5
+#: project/forms/admin_unit.py:65
+msgid "Verify new organization"
+msgstr "Neue Organisation verifizieren"
+
+#: project/forms/admin_unit.py:66
+msgid "If set, events of the new organization are publicly visible."
+msgstr "Wenn gesetzt, sind Veranstaltungen der neuen Organisation öffentlich sichtbar."
+
+#: project/forms/admin_unit.py:72 project/forms/reference_request.py:86
+msgid "Verify reference requests automatically"
+msgstr "Empfehlungsanfragen automatisch verifizieren"
+
+#: project/forms/admin_unit.py:73
+msgid ""
+"If set, all upcoming reference requests of the new organization are "
+"verified automatically."
+msgstr "Wenn gesetzt, werden alle zukünftigen Empfehlungsanfragen der neuen Organisation automatisch verifiziert."
+
+#: project/forms/admin_unit.py:84 project/templates/admin_unit/create.html:5
 #: project/templates/admin_unit/create.html:22
 #: project/templates/manage/admin_units.html:27
 msgid "Create organization"
 msgstr "Organisation erstellen"
 
-#: project/forms/admin_unit.py:67 project/forms/admin_unit.py:90
+#: project/forms/admin_unit.py:92 project/forms/admin_unit.py:115
 msgid "Update settings"
 msgstr "Einstellungen speichern"
 
-#: project/forms/admin_unit.py:71
+#: project/forms/admin_unit.py:96
 msgid "Font"
 msgstr "Schriftart"
 
-#: project/forms/admin_unit.py:73
+#: project/forms/admin_unit.py:98
 msgid "Background Color"
 msgstr "Hintergrundfarbe"
 
-#: project/forms/admin_unit.py:79
+#: project/forms/admin_unit.py:104
 msgid "Primary Color"
 msgstr "Hauptfarbe"
 
-#: project/forms/admin_unit.py:85
+#: project/forms/admin_unit.py:110
 msgid "Link Color"
 msgstr "Linkfarbe"
 
@@ -1141,10 +1159,6 @@ msgstr "Unzulässig"
 msgid "Choose why you rejected the request."
 msgstr "Wähle aus, warum du die Anfrage abgelehnt hast."
 
-#: project/forms/reference_request.py:86
-msgid "Verify reference requests automatically"
-msgstr "Empfehlungsanfragen automatisch verifizieren"
-
 #: project/forms/reference_request.py:90
 msgid "Save review"
 msgstr "Prüfung speichern"
@@ -1543,6 +1557,11 @@ msgstr "Bearbeiten"
 msgid "Additional information"
 msgstr "Zusätzliche Informationen"
 
+#: project/templates/admin_unit/create.html:71
+#, python-format
+msgid "Relation to %(admin_unit_name)s"
+msgstr "Beziehung zu %(admin_unit_name)s"
+
 #: project/templates/admin_unit/invite_member.html:6
 #: project/templates/manage/members.html:12
 msgid "Invite user"
@@ -1960,7 +1979,7 @@ msgstr "Einstellungen erfolgreich aktualisiert"
 msgid "User successfully updated"
 msgstr "Nutzer erfolgreich aktualisiert"
 
-#: project/views/admin_unit.py:46
+#: project/views/admin_unit.py:69
 msgid ""
 "Organizations cannot currently be created. The project is in a closed "
 "test phase. If you are interested, you can contact us."
@@ -1969,15 +1988,15 @@ msgstr ""
 " sich in einer geschlossenen Test-Phase. Bei Interesse kannst du uns "
 "kontaktieren."
 
-#: project/views/admin_unit.py:79
+#: project/views/admin_unit.py:115
 msgid "Organization successfully created"
 msgstr "Organisation erfolgreich erstellt"
 
-#: project/views/admin_unit.py:105
+#: project/views/admin_unit.py:145
 msgid "AdminUnit successfully updated"
 msgstr "Organisation erfolgreich aktualisiert"
 
-#: project/views/admin_unit.py:127
+#: project/views/admin_unit.py:167
 msgid "Organization invitation accepted"
 msgstr "Organisationseinladung akzeptiert"
 
@@ -2172,7 +2191,7 @@ msgstr ""
 "Ob alle zukünftigen Empfehlungsanfragen von %(admin_unit_name)s "
 "automatisch verifiziert werden sollen."
 
-#: project/views/utils.py:54
+#: project/views/utils.py:76
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
@@ -2180,16 +2199,16 @@ msgstr ""
 "Ein Eintrag mit den eingegebenen Werten existiert bereits. Doppelte "
 "Einträge sind nicht erlaubt."
 
-#: project/views/utils.py:105
+#: project/views/utils.py:127
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr "Fehler im Feld %s: %s"
 
-#: project/views/utils.py:112
+#: project/views/utils.py:134
 msgid "Show"
 msgstr "Anzeigen"
 
-#: project/views/utils.py:119
+#: project/views/utils.py:141
 msgid "You do not have permission for this action"
 msgstr "Du hast keine Berechtigung für diese Aktion"
 
diff --git a/project/translations/en/LC_MESSAGES/messages.mo b/project/translations/en/LC_MESSAGES/messages.mo
index 8b55c32160f7086674a0145b4d35e8b54889451f..c83b0a5d999365910590d924e2c2ee0ca6144b90 100644
GIT binary patch
delta 21
ccmZ1|y-<2X2`7h<fr62-m9fF*8ctOf07X0nlK=n!

delta 21
ccmZ1|y-<2X2`7i4iGrbtm9f$08ctOf07YsAm;e9(

diff --git a/project/translations/en/LC_MESSAGES/messages.po b/project/translations/en/LC_MESSAGES/messages.po
index ee54eaf..dcf6dc1 100644
--- a/project/translations/en/LC_MESSAGES/messages.po
+++ b/project/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-10-14 14:32+0200\n"
+"POT-Creation-Date: 2021-10-20 23:30+0200\n"
 "PO-Revision-Date: 2021-04-30 15:04+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -208,7 +208,7 @@ msgstr ""
 #: project/forms/admin.py:12 project/templates/_macros.html:1409
 #: project/templates/layout.html:316
 #: project/templates/widget/event_suggestion/create.html:204
-#: project/views/admin_unit.py:50 project/views/root.py:58
+#: project/views/admin_unit.py:73 project/views/root.py:58
 msgid "Contact"
 msgstr ""
 
@@ -278,37 +278,37 @@ msgstr ""
 msgid "Update organization"
 msgstr ""
 
-#: project/forms/admin_unit.py:14 project/forms/event_place.py:12
+#: project/forms/admin_unit.py:15 project/forms/event_place.py:12
 #: project/forms/organizer.py:12
 msgid "Street"
 msgstr ""
 
-#: project/forms/admin_unit.py:15 project/forms/event_place.py:13
+#: project/forms/admin_unit.py:16 project/forms/event_place.py:13
 #: project/forms/organizer.py:13
 msgid "Postal code"
 msgstr ""
 
-#: project/forms/admin_unit.py:16 project/forms/event_place.py:14
+#: project/forms/admin_unit.py:17 project/forms/event_place.py:14
 #: project/forms/organizer.py:14
 msgid "City"
 msgstr ""
 
-#: project/forms/admin_unit.py:17 project/forms/event_place.py:15
+#: project/forms/admin_unit.py:18 project/forms/event_place.py:15
 #: project/forms/organizer.py:15
 msgid "State"
 msgstr ""
 
-#: project/forms/admin_unit.py:19 project/forms/event_place.py:17
+#: project/forms/admin_unit.py:20 project/forms/event_place.py:17
 #: project/forms/organizer.py:17
 msgid "Latitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:22 project/forms/event_place.py:20
+#: project/forms/admin_unit.py:23 project/forms/event_place.py:20
 #: project/forms/organizer.py:20
 msgid "Longitude"
 msgstr ""
 
-#: project/forms/admin_unit.py:28 project/forms/event.py:36
+#: project/forms/admin_unit.py:29 project/forms/event.py:36
 #: project/forms/event.py:65 project/forms/event.py:398
 #: project/forms/event_place.py:25 project/forms/event_place.py:50
 #: project/forms/event_suggestion.py:26 project/forms/oauth2_client.py:66
@@ -320,25 +320,25 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: project/forms/admin_unit.py:31
+#: project/forms/admin_unit.py:32
 msgid "Short name"
 msgstr ""
 
-#: project/forms/admin_unit.py:32
+#: project/forms/admin_unit.py:33
 msgid "The short name is used to create a unique identifier for your events"
 msgstr ""
 
-#: project/forms/admin_unit.py:40 project/templates/_macros.html:1545
+#: project/forms/admin_unit.py:41 project/templates/_macros.html:1545
 msgid "Short name must contain only letters numbers or underscore"
 msgstr ""
 
-#: project/forms/admin_unit.py:46 project/forms/event.py:57
+#: project/forms/admin_unit.py:47 project/forms/event.py:57
 #: project/forms/event.py:95 project/forms/event_place.py:26
 #: project/forms/organizer.py:26
 msgid "Link URL"
 msgstr ""
 
-#: project/forms/admin_unit.py:47 project/forms/admin_unit_member.py:11
+#: project/forms/admin_unit.py:48 project/forms/admin_unit_member.py:11
 #: project/forms/admin_unit_member.py:23 project/forms/admin_unit_member.py:28
 #: project/forms/event.py:58 project/forms/event_suggestion.py:38
 #: project/forms/organizer.py:27 project/templates/_macros.html:262
@@ -346,44 +346,62 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: project/forms/admin_unit.py:48 project/forms/event.py:59
+#: project/forms/admin_unit.py:49 project/forms/event.py:59
 #: project/forms/event_suggestion.py:31 project/forms/organizer.py:28
 #: project/templates/_macros.html:315
 msgid "Phone"
 msgstr ""
 
-#: project/forms/admin_unit.py:49 project/forms/event.py:60
+#: project/forms/admin_unit.py:50 project/forms/event.py:60
 #: project/forms/organizer.py:29 project/templates/_macros.html:323
 msgid "Fax"
 msgstr ""
 
-#: project/forms/admin_unit.py:50 project/forms/organizer.py:30
+#: project/forms/admin_unit.py:51 project/forms/organizer.py:30
 msgid "Logo"
 msgstr ""
 
-#: project/forms/admin_unit.py:63 project/templates/admin_unit/create.html:5
+#: project/forms/admin_unit.py:65
+msgid "Verify new organization"
+msgstr ""
+
+#: project/forms/admin_unit.py:66
+msgid "If set, events of the new organization are publicly visible."
+msgstr ""
+
+#: project/forms/admin_unit.py:72 project/forms/reference_request.py:86
+msgid "Verify reference requests automatically"
+msgstr ""
+
+#: project/forms/admin_unit.py:73
+msgid ""
+"If set, all upcoming reference requests of the new organization are "
+"verified automatically."
+msgstr ""
+
+#: project/forms/admin_unit.py:84 project/templates/admin_unit/create.html:5
 #: project/templates/admin_unit/create.html:22
 #: project/templates/manage/admin_units.html:27
 msgid "Create organization"
 msgstr ""
 
-#: project/forms/admin_unit.py:67 project/forms/admin_unit.py:90
+#: project/forms/admin_unit.py:92 project/forms/admin_unit.py:115
 msgid "Update settings"
 msgstr ""
 
-#: project/forms/admin_unit.py:71
+#: project/forms/admin_unit.py:96
 msgid "Font"
 msgstr ""
 
-#: project/forms/admin_unit.py:73
+#: project/forms/admin_unit.py:98
 msgid "Background Color"
 msgstr ""
 
-#: project/forms/admin_unit.py:79
+#: project/forms/admin_unit.py:104
 msgid "Primary Color"
 msgstr ""
 
-#: project/forms/admin_unit.py:85
+#: project/forms/admin_unit.py:110
 msgid "Link Color"
 msgstr ""
 
@@ -1100,10 +1118,6 @@ msgstr "Illegal"
 msgid "Choose why you rejected the request."
 msgstr ""
 
-#: project/forms/reference_request.py:86
-msgid "Verify reference requests automatically"
-msgstr ""
-
 #: project/forms/reference_request.py:90
 msgid "Save review"
 msgstr ""
@@ -1500,6 +1514,11 @@ msgstr ""
 msgid "Additional information"
 msgstr ""
 
+#: project/templates/admin_unit/create.html:71
+#, python-format
+msgid "Relation to %(admin_unit_name)s"
+msgstr ""
+
 #: project/templates/admin_unit/invite_member.html:6
 #: project/templates/manage/members.html:12
 msgid "Invite user"
@@ -1911,21 +1930,21 @@ msgstr ""
 msgid "User successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:46
+#: project/views/admin_unit.py:69
 msgid ""
 "Organizations cannot currently be created. The project is in a closed "
 "test phase. If you are interested, you can contact us."
 msgstr ""
 
-#: project/views/admin_unit.py:79
+#: project/views/admin_unit.py:115
 msgid "Organization successfully created"
 msgstr ""
 
-#: project/views/admin_unit.py:105
+#: project/views/admin_unit.py:145
 msgid "AdminUnit successfully updated"
 msgstr ""
 
-#: project/views/admin_unit.py:127
+#: project/views/admin_unit.py:167
 msgid "Organization invitation accepted"
 msgstr ""
 
@@ -2116,22 +2135,22 @@ msgid ""
 "verified automatically."
 msgstr ""
 
-#: project/views/utils.py:54
+#: project/views/utils.py:76
 msgid ""
 "An entry with the entered values ​​already exists. Duplicate entries are "
 "not allowed."
 msgstr ""
 
-#: project/views/utils.py:105
+#: project/views/utils.py:127
 #, python-format
 msgid "Error in the %s field - %s"
 msgstr ""
 
-#: project/views/utils.py:112
+#: project/views/utils.py:134
 msgid "Show"
 msgstr ""
 
-#: project/views/utils.py:119
+#: project/views/utils.py:141
 msgid "You do not have permission for this action"
 msgstr ""
 
diff --git a/project/views/admin_unit.py b/project/views/admin_unit.py
index a1a1a12..57e5763 100644
--- a/project/views/admin_unit.py
+++ b/project/views/admin_unit.py
@@ -12,21 +12,44 @@ from project.access import (
 )
 from project.forms.admin_unit import CreateAdminUnitForm, UpdateAdminUnitForm
 from project.models import AdminUnit, AdminUnitInvitation, AdminUnitRelation, Location
-from project.services.admin_unit import insert_admin_unit_for_user
+from project.services.admin_unit import (
+    insert_admin_unit_for_user,
+    upsert_admin_unit_relation,
+)
 from project.utils import strings_are_equal_ignoring_case
 from project.views.utils import (
     flash_errors,
     flash_message,
+    get_current_admin_unit,
     handleSqlError,
     permission_missing,
     send_mails,
 )
 
 
-def update_admin_unit_with_form(admin_unit, form):
+def update_admin_unit_with_form(admin_unit, form, embedded_relation_enabled=False):
     form.populate_obj(admin_unit)
 
 
+def add_relation(admin_unit, form, current_admin_unit):
+    embedded_relation = form.embedded_relation.object_data
+
+    verify = embedded_relation.verify and current_admin_unit.can_verify_other
+    auto_verify_event_reference_requests = (
+        embedded_relation.auto_verify_event_reference_requests
+        and current_admin_unit.incoming_reference_requests_allowed
+    )
+
+    if not verify and not auto_verify_event_reference_requests:
+        return
+
+    relation = upsert_admin_unit_relation(current_admin_unit.id, admin_unit.id)
+    relation.verify = verify
+    relation.auto_verify_event_reference_requests = auto_verify_event_reference_requests
+
+    db.session.commit()
+
+
 @app.route("/admin_unit/create", methods=("GET", "POST"))
 @auth_required()
 def admin_unit_create():
@@ -57,6 +80,20 @@ def admin_unit_create():
     if invitation and not form.is_submitted():
         form.name.data = invitation.admin_unit_name
 
+    current_admin_unit = get_current_admin_unit()
+    embedded_relation_enabled = (
+        not invitation
+        and current_admin_unit
+        and has_access(current_admin_unit, "admin_unit:update")
+        and (
+            current_admin_unit.can_verify_other
+            or current_admin_unit.incoming_reference_requests_allowed
+        )
+    )
+
+    if embedded_relation_enabled and not form.is_submitted():
+        form.embedded_relation.verify.data = True
+
     if form.validate_on_submit():
         admin_unit = AdminUnit()
         admin_unit.location = Location()
@@ -67,7 +104,10 @@ def admin_unit_create():
                 admin_unit, current_user, invitation
             )
 
-            if relation:
+            if embedded_relation_enabled:
+                add_relation(admin_unit, form, current_admin_unit)
+
+            if invitation and relation:
                 send_admin_unit_invitation_accepted_mails(
                     invitation, relation, admin_unit
                 )
@@ -84,7 +124,11 @@ def admin_unit_create():
     else:
         flash_errors(form)
 
-    return render_template("admin_unit/create.html", form=form)
+    return render_template(
+        "admin_unit/create.html",
+        form=form,
+        embedded_relation_enabled=embedded_relation_enabled,
+    )
 
 
 @app.route("/admin_unit/<int:id>/update", methods=("GET", "POST"))
diff --git a/project/views/manage.py b/project/views/manage.py
index 45fcb9b..6fa9376 100644
--- a/project/views/manage.py
+++ b/project/views/manage.py
@@ -1,4 +1,4 @@
-from flask import flash, g, redirect, render_template, request, url_for
+from flask import flash, redirect, render_template, request, url_for
 from flask_babelex import gettext
 from flask_security import auth_required, current_user
 from sqlalchemy.exc import SQLAlchemyError
@@ -32,10 +32,11 @@ from project.services.event_suggestion import get_event_reviews_query
 from project.views.event import get_event_category_choices
 from project.views.utils import (
     flash_errors,
-    get_manage_admin_unit_from_request,
+    get_current_admin_unit,
     get_pagination_urls,
     handleSqlError,
     permission_missing,
+    set_current_admin_unit,
 )
 
 
@@ -48,7 +49,7 @@ def manage_after_login():
 @app.route("/manage")
 @auth_required()
 def manage():
-    admin_unit = get_manage_admin_unit_from_request(request)
+    admin_unit = get_current_admin_unit(False)
 
     if admin_unit:
         return redirect(url_for("manage_admin_unit", id=admin_unit.id))
@@ -115,7 +116,7 @@ def manage_admin_units():
 @auth_required()
 def manage_admin_unit(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
     return redirect(url_for("manage_admin_unit_events", id=admin_unit.id))
 
 
@@ -123,7 +124,7 @@ def manage_admin_unit(id):
 @auth_required()
 def manage_admin_unit_event_reviews(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
     admin_unit_suggestions_enabled_or_404(admin_unit)
 
     event_suggestions_paginate = (
@@ -145,7 +146,7 @@ def manage_admin_unit_event_reviews(id):
 @auth_required()
 def manage_admin_unit_events(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     params = EventSearchParams()
 
@@ -180,7 +181,7 @@ def manage_admin_unit_events(id):
 @auth_required()
 def manage_admin_unit_organizers(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     organizers = (
         EventOrganizer.query.filter(EventOrganizer.admin_unit_id == admin_unit.id)
@@ -200,7 +201,7 @@ def manage_admin_unit_organizers(id):
 @auth_required()
 def manage_admin_unit_event_places(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     form = FindEventPlaceForm(**request.args)
 
@@ -222,7 +223,7 @@ def manage_admin_unit_event_places(id):
 @auth_required()
 def manage_admin_unit_members(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     if not has_access(admin_unit, "admin_unit.members:read"):
         return permission_missing(url_for("manage_admin_unit", id=id))
@@ -256,7 +257,7 @@ def manage_admin_unit_members(id):
 @auth_required()
 def manage_admin_unit_relations(id, path=None):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     return render_template(
         "manage/relations.html",
@@ -269,7 +270,7 @@ def manage_admin_unit_relations(id, path=None):
 @auth_required()
 def manage_admin_unit_organization_invitations(id, path=None):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     return render_template(
         "manage/organization_invitations.html",
@@ -281,7 +282,7 @@ def manage_admin_unit_organization_invitations(id, path=None):
 @auth_required()
 def manage_admin_unit_widgets(id):
     admin_unit = get_admin_unit_for_manage_or_404(id)
-    g.manage_admin_unit_id = id
+    set_current_admin_unit(admin_unit)
 
     default_background_color = "#ffffff"
     default_primary_color = "#007bff"
diff --git a/project/views/utils.py b/project/views/utils.py
index ab3ff33..0473869 100644
--- a/project/views/utils.py
+++ b/project/views/utils.py
@@ -4,22 +4,47 @@ from flask import Markup, flash, g, redirect, render_template, request, url_for
 from flask_babelex import gettext
 from flask_login.utils import decode_cookie
 from flask_mail import Message
+from flask_security import current_user
 from psycopg2.errorcodes import UNIQUE_VIOLATION
 from sqlalchemy.exc import SQLAlchemyError
 from wtforms import FormField
 
 from project import app, db, mail
-from project.access import get_admin_unit_for_manage
+from project.access import get_admin_unit_for_manage, get_admin_units_for_manage
 from project.dateutils import berlin_tz, round_to_next_day
 from project.models import Analytics, EventAttendanceMode, EventDate
 from project.utils import get_place_str
 
 
-def get_manage_admin_unit_from_request(request):
-    manage_admin_unit_id = getattr(g, "manage_admin_unit_id", 0)
-    if manage_admin_unit_id > 0:
-        return get_admin_unit_for_manage(manage_admin_unit_id)
+def set_current_admin_unit(admin_unit):
+    if admin_unit:
+        setattr(g, "manage_admin_unit", admin_unit)
+    else:
+        delattr(g, "manage_admin_unit")
 
+
+def get_current_admin_unit(fallback=True):
+    admin_unit = getattr(g, "manage_admin_unit", None)
+
+    if admin_unit:
+        return admin_unit
+
+    if current_user.is_authenticated:
+        admin_unit = get_current_admin_unit_from_cookies()
+
+        if not admin_unit and fallback:
+            admin_units = get_admin_units_for_manage()
+
+            if len(admin_units) > 0:
+                admin_unit = admin_units[0]
+
+    if admin_unit:
+        set_current_admin_unit(admin_unit)
+
+    return admin_unit
+
+
+def get_current_admin_unit_from_cookies():
     try:
         if "manage_admin_unit_id" in request.cookies:
             encoded = request.cookies.get("manage_admin_unit_id")
diff --git a/tests/conftest.py b/tests/conftest.py
index 24c1d09..140639d 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -26,6 +26,7 @@ def app():
 
     app.config["SERVER_NAME"] = None
     app.config["TESTING"] = True
+    app.config["ADMIN_UNIT_CREATE_REQUIRES_ADMIN"] = False
     app.testing = True
 
     return app
diff --git a/tests/views/test_admin_unit.py b/tests/views/test_admin_unit.py
index 8e58107..18ee349 100644
--- a/tests/views/test_admin_unit.py
+++ b/tests/views/test_admin_unit.py
@@ -205,6 +205,38 @@ def test_create_from_invitation_currentUserDoesNotMatchInvitationEmail(
     utils.assert_response_redirect(response, "manage_admin_units")
 
 
+def test_create_with_relation(client, app, utils, seeder):
+    user_id = seeder.create_user(admin=False)
+    utils.login()
+    admin_unit_id = seeder.create_admin_unit(user_id, can_verify_other=True)
+
+    url = utils.get_url("admin_unit_create")
+    response = utils.get_ok(url)
+
+    response = utils.post_form(
+        url,
+        response,
+        {
+            "name": "Other Crew",
+            "short_name": "other_crew",
+            "location-postalCode": "38640",
+            "location-city": "Goslar",
+        },
+    )
+    assert response.status_code == 302
+
+    with app.app_context():
+        from project.services.admin_unit import get_admin_unit_by_name
+
+        admin_unit = get_admin_unit_by_name("Other Crew")
+        assert admin_unit is not None
+
+        relation = admin_unit.incoming_relations[0]
+        assert relation.source_admin_unit_id == admin_unit_id
+        assert relation.auto_verify_event_reference_requests is False
+        assert relation.verify
+
+
 def test_update(client, app, utils, seeder):
     seeder.create_user()
     user_id = utils.login()

From 8438b6fd4bb17703461d8066f4f9c8253d37ebe7 Mon Sep 17 00:00:00 2001
From: Daniel Grams <grams.daniel@gmail.com>
Date: Thu, 21 Oct 2021 09:58:11 +0200
Subject: [PATCH 2/2] Organisation bei der Erstellung optional verifizieren
 #313

---
 project/views/utils.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project/views/utils.py b/project/views/utils.py
index 0473869..83f78e6 100644
--- a/project/views/utils.py
+++ b/project/views/utils.py
@@ -19,8 +19,6 @@ from project.utils import get_place_str
 def set_current_admin_unit(admin_unit):
     if admin_unit:
         setattr(g, "manage_admin_unit", admin_unit)
-    else:
-        delattr(g, "manage_admin_unit")
 
 
 def get_current_admin_unit(fallback=True):