backoffice: go to "return url" after removal of draft (#47598)

tests/test_backoffice_pages.py

@@ -2674,6 +2674,17 @@ def test_backoffice_submission_with_return_url(pub):
     resp = resp.form.submit('submit')  # -> to submit
     assert resp.location == 'https://example.org'
 
+    # test removal of draft
+    resp = app.get('/backoffice/submission/form-title/?ReturnURL=https://example.org')
+    resp = resp.follow().follow()
+    resp.form['f1'] = 'test submission'
+    resp.form['f2'] = 'baz'
+    resp.form['f3'] = 'C'
+    resp = resp.form.submit('submit')  # -> to validation
+    resp = resp.click('Delete this form')
+    resp = resp.form.submit('delete')
+    assert resp.location == 'https://example.org'
+
 
 def test_backoffice_parallel_submission(pub):
     user = create_user(pub)

wcs/backoffice/submission.py

@@ -71,8 +71,11 @@ class RemoveDraftDirectory(Directory):
 
         if formdata.tracking_code:
             get_publisher().tracking_code_class.remove_object(formdata.tracking_code)
+        return_url = '../..'
+        if formdata.submission_context:
+            return_url = formdata.submission_context.get('return_url', return_url)
         formdata.remove_self()
-        return redirect('../..')
+        return redirect(return_url)
 
 
 class SubmissionFormStatusPage(FormStatusPage):