0001-misc-redirect-form-def-data-URL-to-include-category-.patch

Frédéric Péters, 21 octobre 2022 14:31

Voir les différences: en ligne côte à côte

Subject: [PATCH] misc: redirect form{def,data} URL to include category slug
 (#69546)

 tests/form_pages/test_all.py      | 92 ++++++++++++++++++++++++++++++-
 wcs/backoffice/data_management.py |  1 +
 wcs/backoffice/submission.py      |  1 +
 wcs/carddef.py                    |  2 +-
 wcs/formdata.py                   |  7 ++-
 wcs/formdef.py                    |  4 +-
 wcs/forms/common.py               | 12 ++++
 wcs/forms/root.py                 | 32 ++++++++++-
 wcs/root.py                       |  2 +-
 9 files changed, 145 insertions(+), 8 deletions(-)

         assert 'Draft' in resp
         assert '<a href="/test/%s"' % draft.id in resp
         resp = app.get('/test/%s' % formdata.id)
         resp.status_int = 200
         assert resp.location == 'http://example.net/test/1/'
         resp = app.get('/test/%s/' % draft.id, status=302)
         assert resp.location.startswith('http://example.net/foobar/test/%s/' % draft.id)
         resp = resp.follow(status=302)
         assert resp.location.startswith('http://example.net/foobar/test/?mt=')
         resp = resp.follow(status=200)
         # disable formdef: formdatas are still visible and accessible, drafts are not
-...
         assert '<a href="test/%s"' % draft.id not in resp
         resp = app.get('/test/%s/' % formdata.id)
         resp = app.get('/test/%s/' % draft.id, status=302)
         assert resp.location.startswith('http://example.net/foobar/test/%s/' % draft.id)
         resp = resp.follow(status=302)
         assert resp.location.startswith('http://example.net/foobar/test/?mt=')
         resp = resp.follow(status=403)
-...
         resp = resp.follow()
         assert 'HELLO GLOBAL INTERACTIVE ACTION' in resp.text
     def test_category_redirection(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'test category redirection'
         formdef.fields = []
         formdef.store()
         get_app(pub).get(formdef.get_url())
         Category.wipe()
         cat = Category(name='foo')
         cat.store()
         cat2 = Category(name='bar')
         cat2.store()
         formdef.category_id = cat.id
         formdef.store()
         formdata = formdef.data_class()()
         formdata.just_created()
         formdata.store()
         resp = get_app(pub).get(formdef.get_url(), status=302)
         assert resp.location == 'http://example.net/foo/test-category-redirection/'
         resp = resp.follow()
         resp = get_app(pub).get(formdef.get_url() + '?test=toto', status=302)
         assert resp.location == 'http://example.net/foo/test-category-redirection/?test=toto'
         get_app(pub).get('/bar/test-category-redirection/', status=404)
         resp = get_app(pub).get(formdata.get_url(), status=302)
         assert (
             urllib.parse.urlparse(resp.location).path
             == urllib.parse.urlparse(formdata.get_url(include_category=True)).path
+        )
         resp = get_app(pub).get(formdata.get_url() + '?test=toto', status=302)
         assert (
             urllib.parse.urlparse(resp.location).path
             == urllib.parse.urlparse(formdata.get_url(include_category=True)).path
+        )
         assert urllib.parse.urlparse(resp.location).query == 'test=toto'
         # check with formdef and category with same slug
         formdef = FormDef()
         formdef.name = 'bar'
         formdef.fields = []
         formdef.category_id = cat2.id
         formdef.store()
         formdata2 = formdef.data_class()()
         formdata2.just_created()
         formdata2.store()
         resp = get_app(pub).get('/bar/', status=302)  # redirect even if category with same slug
         assert resp.location == 'http://example.net/bar/bar/'
         resp = get_app(pub).get('/bar/bar/', status=200)  # get formpage when full url is used
         assert resp.pyquery('#steps')  # make sure it's a form page
         resp = get_app(pub).get('/bar/bar/bar/', status=404)  # do not allow to go deeper
         resp = get_app(pub).get(formdata2.get_url(), status=302)
         assert (
             urllib.parse.urlparse(resp.location).path
             == urllib.parse.urlparse(formdata2.get_url(include_category=True)).path
+        )
         # check other pages are ok with and without category slug
         get_app(pub).get('/bar/qrcode', status=200)
         get_app(pub).get('/bar/bar/qrcode', status=200)
         # check another formdef in same category is ok
         formdef = FormDef()
         formdef.name = 'bar2'
         formdef.fields = []
         formdef.category_id = cat2.id
         formdef.store()
         resp = get_app(pub).get('/bar2/', status=302)
         assert resp.location == 'http://example.net/bar/bar2/'
         resp = get_app(pub).get('/bar/bar2/', status=200)
         assert resp.pyquery('#steps')  # make sure it's a form page

wcs/backoffice/data_management.py
128	128	search_label = _('Search in card content')
129	129	formdef_view_label = _('View Card')
130	130	has_json_export_support = True
	131	ensure_parent_category_in_url = False
131	132
132	133	@property
133	134	def add(self):

wcs/backoffice/submission.py
110	110	steps_templates = ['wcs/formdata_steps.html']
111	111	has_channel_support = True
112	112	has_user_support = True
	113	ensure_parent_category_in_url = False
113	114
114	115	def __init__(self, args, *kwargs):
115	116	super().__init__(args, *kwargs)

             return workflow
         def get_url(self, backoffice=False):
         def get_url(self, backoffice=False, **kwargs):
             # always return backoffice URL
             base_url = get_publisher().get_backoffice_url() + '/data'
             return '%s/%s/' % (base_url, self.url_name)

             self.status = status
             self.store()
         def get_url(self, backoffice=False):
             return '%s%s/' % (self.formdef.get_url(backoffice=backoffice), self.id)
         def get_url(self, backoffice=False, include_category=False):
             return '%s%s/' % (
                 self.formdef.get_url(backoffice=backoffice, include_category=include_category),
                 self.id,
+            )
         def get_backoffice_url(self):
             return self.get_url(backoffice=True)

         def slug(self, value):
             self.url_name = value
         def get_url(self, backoffice=False, preview=False):
         def get_url(self, backoffice=False, preview=False, include_category=False):
             if backoffice:
                 base_url = get_publisher().get_backoffice_url() + '/management'
             elif preview:
                 base_url = get_publisher().get_frontoffice_url() + '/preview'
             else:
                 base_url = get_publisher().get_frontoffice_url()
             if include_category and self.category_id:
                 return '%s/%s/%s/' % (base_url, self.category.slug, self.url_name)
             return '%s/%s/' % (base_url, self.url_name)
         def get_api_url(self):

             return r.getvalue()
         def _q_index(self):
             if (
                 self.formdef.category_id
                 and self.parent_view
                 and self.parent_view.ensure_parent_category_in_url
                 and get_request().get_method() == 'GET'
                 and not self.parent_view.parent_category
             ):
                 url = self.filled.get_url(include_category=True)
                 if get_request().get_query():
                     url += '?' + get_request().get_query()
                 return redirect(url)
             if self.filled.is_draft():
                 return self.restore_draft()

+        ]
         do_not_call_in_templates = True
         ensure_parent_category_in_url = True
         filling_templates = ['wcs/front/formdata_filling.html', 'wcs/formdata_filling.html']
         validation_templates = ['wcs/front/formdata_validation.html', 'wcs/formdata_validation.html']
         steps_templates = ['wcs/front/formdata_steps.html', 'wcs/formdata_steps.html']
         sidebox_templates = ['wcs/front/formdata_sidebox.html', 'wcs/formdata_sidebox.html']
         formdef_class = FormDef
         def __init__(self, component):
         def __init__(self, component, parent_category=None):
             try:
                 self.formdef = self.formdef_class.get_by_urlname(component)
             except KeyError:
                 raise errors.TraversalError()
             self.parent_category = parent_category
             if self.parent_category and self.formdef.category_id != self.parent_category.id:
                 raise errors.TraversalError()
             self.substvars = {}
             get_publisher().substitutions.feed(self)
             get_publisher().substitutions.feed(self.formdef)
-...
             self._pages = None
         def _q_index(self):
             if (
                 self.ensure_parent_category_in_url
                 and get_request().get_method() == 'GET'
                 and self.formdef.category_id
                 and not self.parent_category
             ):
                 url = self.formdef.get_url(include_category=True)
                 if get_request().get_query():
                     url += '?' + get_request().get_query()
                 return redirect(url)
             self.check_access()
             authentication_context_check_result = self.check_authentication_context()
             if authentication_context_check_result:
-...
             return PublicFormStatusPage
         def _q_lookup(self, component):
             if (
                 self.ensure_parent_category_in_url
                 and get_request().get_method() == 'GET'
                 and not self.parent_category
             ):
                 # handle special case where there's a formdef and a category with the same
                 # slug; recurse into self with parent_category set to avoid the redirect to
                 # full URL step.
                 category = Category.get_by_slug(self.formdef.url_name, ignore_errors=True)
                 formdef = self.formdef_class.get_by_urlname(component, ignore_errors=True)
                 if category and formdef:
                     return self.__class__(component, parent_category=category)
             try:
                 filled = self.formdef.data_class().get(component)
             except KeyError:
-...
             return ApiCategoriesDirectory()._q_index()
         def _q_lookup(self, component):
             return FormPage(component)
             return FormPage(component, parent_category=self.category)
     class PublicFormStatusPage(FormStatusPage):

             except KeyError:
                 pass
             else:
                 # redirect to category if there's not a formdef with same slug
                 # display category unless there's a formdef with same slug
                 try:
                     FormDef.get_by_urlname(component)
                 except KeyError:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-redirect-form-def-data-URL-to-include-category-.patch