misc: always allow restoring drafts (#37107)

tests/test_form_pages.py

@@ -1965,11 +1965,12 @@ def test_form_draft_with_date(pub):
 
     assert '2012-02-12' in resp.body
 
-def test_form_direct_draft_access(pub):
+@pytest.mark.parametrize('tracking_code', [True, False])
+def test_form_direct_draft_access(pub, tracking_code):
     user = create_user(pub)
     formdef = create_formdef()
     formdef.fields = [fields.StringField(id='0', label='string')]
-    formdef.enable_tracking_codes = True
+    formdef.enable_tracking_codes = tracking_code
     formdef.store()
 
     formdata = formdef.data_class()()

wcs/forms/root.py

@@ -1286,14 +1286,8 @@ class FormPage(Directory, FormTemplateMixin):
                 return redirect(get_publisher().get_backoffice_url() + '/submission/')
             return PublicFormStatusPage(self.formdef, filled)
 
+        # restore draft
         session = get_session()
-        if not (get_request().is_in_backoffice() or
-                self.has_draft_support() or
-                session.is_anonymous_submitter(filled)):
-            # don't allow restoring drafts if drafts are no longer enabled for
-            # this form.
-            raise errors.AccessForbiddenError()
-
         if not (get_request().is_in_backoffice() and filled.backoffice_submission):
             if session.is_anonymous_submitter(filled):
                 pass