use create_or_edit_object_redirect in save_nested_forms + allow redirect_to as a callable

Author: berycz

iommi/form.py

@@ -238,10 +238,12 @@ class CallbackInvokingFailed(Exception):
 
         request.method = 'GET'
 
-        redirect_to = form.extra.get('redirect_to', lambda **_: request.POST.get('next', '.'))
-        target = form.invoke_callback(redirect_to)
-        assert isinstance(target, str), 'redirect_to must return a str'
-        return HttpResponseRedirect(target)
+        return create_or_edit_object_redirect(
+            is_create=False,
+            redirect_to=form.extra.get('redirect_to', lambda **_: request.POST.get('next', '.')),
+            redirect=form.extra.get('redirect', lambda redirect_to, **_: HttpResponseRedirect(redirect_to)),
+            form=form,
+        )
 
 
 def create_or_edit_object__post_handler(*, form, is_create=None, **_):
@@ -1522,9 +1524,11 @@ def is_django_promise_with_string_proxy(redirect_to):
 
 
 def create_or_edit_object_redirect(is_create, redirect_to, redirect, form):
+    if callable(redirect_to):
+        redirect_to = form.invoke_callback(redirect_to)
     assert (
         redirect_to is None or isinstance(redirect_to, str) or is_django_promise_with_string_proxy(redirect_to)
-    ), 'redirect_to must be a str'
+    ), 'redirect_to must be a str or callable'
     if redirect_to is None:
         if is_create:
             redirect_to = "../"

iommi/form__tests.py

@@ -3927,6 +3927,25 @@ def test_save_nested_forms():
     assert not form.get_errors()
 
 
+@pytest.mark.django_db
+def test_save_nested_forms_redirect():
+    black_sabbath = Artist.objects.create(name='Black Sabbath')
+    Album.objects.create(name='Heaven & Hell', artist=black_sabbath, year=1980)
+
+    form = Form(
+        fields=dict(
+            create_form=Form.create(auto__model=Artist),
+            edit_table=EditTable(auto__model=Album),
+        ),
+        actions__submit__post_handler = save_nested_forms,
+        extra__redirect_to=lambda **_: '../foo',
+    )
+
+    response = form.bind(request=req('POST', **{'-submit': ''})).render_to_response()
+    assert response.status_code == 302
+    assert response['Location'] == '../foo'
+
+
 @pytest.mark.django_db
 def test_nested_forms_abort_save_on_fail():
     dark_funeral = Artist.objects.create(name='Dark Funeral')