Settings: Move settings for events to event settings section

TYPE: Feature
LINK: None

src/onegov/org/forms/settings.py

@@ -702,27 +702,6 @@ class ModuleSettingsForm(Form):
             ('notes', _("Notes")),
         ])
 
-    event_locations = TagsField(
-        label=_("Values of the location filter"),
-        fieldset=_("Events"),)
-
-    event_filter_type = RadioField(
-        label=_('Choose the filter type for events (default is \'tags\')'),
-        fieldset=_("Events"),
-        choices=(
-            ('tags', _('A predefined set of tags')),
-            ('filters', _('Manually configurable filters')),
-            ('tags_and_filters', _('Both, predefined tags as well as '
-                                   'configurable filters')),
-        ),
-        default='tags'
-    )
-
-    event_files = UploadOrSelectExistingMultipleFilesField(
-        label=_("General event documents"),
-        fieldset=_("Events"),
-    )
-
     mtan_session_duration_seconds = IntegerField(
         label=_('Duration of mTAN session'),
         description=_('Specify in number of seconds'),
@@ -1227,6 +1206,21 @@ class EventSettingsForm(Form):
         default=False
     )
 
+    event_locations = TagsField(
+        label=_("Values of the location filter"),
+    )
+
+    event_filter_type = RadioField(
+        label=_('Choose the filter type for events (default is \'Tags\')'),
+        choices=(
+            ('tags', _('A predefined set of tags')),
+            ('filters', _('Manually configurable filters')),
+            ('tags_and_filters', _('Both, predefined tags as well as '
+                                   'configurable filters')),
+        ),
+        default='tags'
+    )
+
     event_files = UploadOrSelectExistingMultipleFilesField(
         label=_("Documents"),
         fieldset=_("General event documents")

src/onegov/org/locale/de_CH/LC_MESSAGES/onegov.org.po

@@ -1627,8 +1627,8 @@ msgstr "Personen"
 msgid "Values of the location filter"
 msgstr "Werte des Ortfilters"
 
-msgid "Choose the filter type for events (default is 'tags')"
-msgstr "Wählen Sie den Filtertyp für Veranstaltungen (Standard ist 'tags')"
+msgid "Choose the filter type for events (default is 'Tags')"
+msgstr "Wählen Sie den Filtertyp für Veranstaltungen (Standard ist 'Tags')"
 
 msgid "A predefined set of tags"
 msgstr "Ein vordefiniertes Set von Tags"

src/onegov/org/locale/fr_CH/LC_MESSAGES/onegov.org.po

@@ -1629,7 +1629,7 @@ msgstr "Personnes"
 msgid "Values of the location filter"
 msgstr "Valeurs du filtre de localisation"
 
-msgid "Choose the filter type for events (default is 'tags')"
+msgid "Choose the filter type for events (default is 'Tags')"
 msgstr ""
 "Choisissez le type de filtre pour les événements (la valeur par défaut est "
 "'tags')"

src/onegov/org/locale/it_CH/LC_MESSAGES/onegov.org.po

@@ -1629,7 +1629,7 @@ msgstr "Persone"
 msgid "Values of the location filter"
 msgstr "Valori del filtro posizione"
 
-msgid "Choose the filter type for events (default is 'tags')"
+msgid "Choose the filter type for events (default is 'Tags')"
 msgstr ""
 "Scegliere il tipo di filtro per gli eventi (l'impostazione predefinita è "
 "'tag')"

tests/onegov/org/test_views_event.py

@@ -28,7 +28,7 @@ def etree_to_dict(root, node_name=''):
 
 def test_view_occurrences(client):
     client.login_admin()
-    settings = client.get('/module-settings')
+    settings = client.get('/event-settings')
     settings.form['event_locations'] = [
         "Gemeindesaal", "Sportanlage", "Turnhalle"
     ]
@@ -180,7 +180,7 @@ def dates(query=''):
 
     def set_setting_event_filter_type(client, event_filter_type):
         client.login_admin()
-        settings = client.get('/module-settings')
+        settings = client.get('/event-settings')
         settings.form['event_filter_type'] = event_filter_type
         settings.form.submit()
         assert client.app.org.event_filter_type == event_filter_type
@@ -249,15 +249,15 @@ def test_view_occurrences_event_documents(client):
 
     with (TemporaryDirectory() as td):
         client.login_admin()
-        settings = client.get('/module-settings')
+        settings = client.get('/event-settings')
         filename_1 = os.path.join(td, 'zoo-programm-saison-2024.pdf')
         pdf_1 = create_pdf(filename_1)
         settings.form.fields['event_files'][-1].value = [filename_1]
         settings.files = [pdf_1]
         settings = settings.form.submit().follow()
         assert settings.status_code == 200
 
-        settings = client.get('/module-settings')
+        settings = client.get('/event-settings')
         assert "Verknüpfte Datei" in settings
         assert "zoo-programm-saison-2024.pdf" in settings
         client.logout()
@@ -269,7 +269,7 @@ def test_view_occurrences_event_documents(client):
 
 def test_many_filters(client):
     assert client.login_admin()
-    page = client.get('/module-settings')
+    page = client.get('/event-settings')
     page.form['event_filter_type'] = 'filters'
     page.form.submit()
     page = client.get('/events')

tests/onegov/org/test_views_settings.py

@@ -92,7 +92,7 @@ def test_settings(client):
     ) in page
 
     # module settings
-    settings = client.get('/module-settings')
+    settings = client.get('/event-settings')
     assert client.app.org.event_filter_type == 'tags'
     assert settings.form['event_filter_type'].value == 'tags'
 

tests/onegov/town6/test_views_event.py

@@ -288,7 +288,7 @@ def test_view_occurrences_event_documents(client):
         settings = settings.form.submit().follow()
         assert settings.status_code == 200
 
-        settings = client.get('/module-settings')
+        settings = client.get('/event-settings')
         assert "Verknüpfte Datei" in settings
         assert "zoo-programm-saison-2024.pdf" in settings
         client.logout()