Apply for all settings views

Author: Tschuppi81

src/onegov/org/layout.py

@@ -2741,8 +2741,10 @@ def links() -> Iterator[Link | LinkGroup]:
             if self.request.is_manager:
                 yield Link(
                     text=_('Edit'),
-                    url=self.request.link(self.request.app.org,
-                                          'event-settings'),
+                    url=self.request.return_here(
+                        self.request.link(self.request.app.org,
+                                          'event-settings')
+                    ),
                     attrs={'class': 'edit-link'}
                 )
 

src/onegov/org/views/settings.py

@@ -7,7 +7,7 @@
 from markupsafe import Markup
 from webob.exc import HTTPForbidden
 from onegov.api.models import ApiKey
-from onegov.core.elements import Link, Confirm, Intercooler, BackLink
+from onegov.core.elements import Link, Confirm, Intercooler
 from onegov.core.security import Secret
 from onegov.core.templates import render_macro
 from onegov.form import Form
@@ -136,16 +136,22 @@ def handle_generic_settings(
     subtitle: str | None = None
 ) -> RenderData | Response:
 
+    settings_url = request.link(self, name='settings')
+
     layout = layout or SettingsLayout(self, request, title)
     layout.edit_mode = True
-    layout.editmode_links[1] = BackLink(attrs={'class': 'cancel-link'})
+    layout.editmode_links[1] = Link(
+        text=_('Cancel'),
+        url=request.return_to_url(settings_url),
+        attrs={'class': 'cancel-link'}
+    )
     request.include('fontpreview')
 
     if form.submitted(request):
         form.populate_obj(self)
 
         request.success(_('Your changes were saved'))
-        return request.redirect(request.link(self, name='settings'))
+        return request.redirect(settings_url)
     elif request.method == 'GET':
         form.process(obj=self)
 

tests/onegov/org/test_views_event.py

@@ -1170,7 +1170,7 @@ def test_event_settings_return_to(client: Client) -> None:
     # opening the event settings from the events overview remembers the origin,
     # so both the cancel link and a successful save return to the overview
     events = client.get('/events')
-    settings = events.click('Einstellungen', href='event-settings')
+    settings = events.click('Bearbeiten', href='event-settings')
 
     cancel_href = settings.pyquery('a.cancel-link').attr('href')
     assert cancel_href.endswith('/events')
@@ -1187,8 +1187,7 @@ def test_event_edit_cancel_returns_to_origin(client: Client) -> None:
     client.login_admin()
 
     # the occurrence page links to the edit view with a return-to parameter,
-    # so cancelling the edit returns to that occurrence instead of using the
-    # browser history
+    # so cancelling the edit returns to that occurrence
     occurrence = client.get('/events').click('Generalversammlung')
     origin = occurrence.request.url