entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 45 Releases Activity

misc: always use lazy evaluation for URL templates (#45806)

This commit is contained in:
Frédéric Péters 2020-08-10 15:25:49 +02:00 committed by Thomas NOEL
parent 0df992678e
commit 48389550d7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wcs/data_sources.py
View File

@ -244,7 +244,7 @@ def get_structured_items(data_source, mode=None):
return []
url = url.strip()
if Template.is_template_string(url):
vars = get_publisher().substitutions.get_context_variables(mode=mode)
vars = get_publisher().substitutions.get_context_variables(mode='lazy')
url = get_variadic_url(url, vars)
request = get_request()

4
wcs/forms/root.py
View File

@ -579,7 +579,7 @@ class FormPage(Directory, FormTemplateMixin):
if self.formdef.is_disabled():
if self.formdef.disabled_redirection:
return misc.get_variadic_url(self.formdef.disabled_redirection,
get_publisher().substitutions.get_context_variables())
get_publisher().substitutions.get_context_variables(mode='lazy'))
else:
raise errors.AccessForbiddenError()
return False
@ -1442,7 +1442,7 @@ class RootDirectory(AccessControlled, Directory):
if redirect_url:
return redirect(misc.get_variadic_url(redirect_url,
get_publisher().substitutions.get_context_variables()))
get_publisher().substitutions.get_context_variables(mode='lazy')))
template.html_top(default_org = _('Forms'))
r = TemplateIO(html=True)

4
wcs/qommon/form.py
View File

@ -2122,7 +2122,7 @@ class JsonpSingleSelectWidget(Widget):
def get_select2_url(self):
if Template.is_template_string(self.url):
vars = get_publisher().substitutions.get_context_variables()
vars = get_publisher().substitutions.get_context_variables(mode='lazy')
# skip variables that were not set (None)
vars = dict((x, y) for x, y in vars.items() if y is not None)
url = misc.get_variadic_url(self.url, vars, encode_query=False)
@ -2154,7 +2154,7 @@ class AutocompleteStringWidget(WcsExtraStringWidget):
def render_content(self):
if Template.is_template_string(self.url):
vars = get_publisher().substitutions.get_context_variables()
vars = get_publisher().substitutions.get_context_variables(mode='lazy')
# skip variables that were not set (None)
vars = dict((x, y) for x, y in vars.items() if y is not None)
url = misc.get_variadic_url(self.url, vars, encode_query=False)

2
wcs/qommon/ident/idp.py
View File

@ -146,7 +146,7 @@ class MethodDirectory(Directory):
if not get_request().user or not get_session().name_identifier:
if get_cfg('saml_identities', {}).get('registration-url'):
vars = get_publisher().substitutions.get_context_variables()
vars = get_publisher().substitutions.get_context_variables(mode='lazy')
vars['next_url'] = get_request().get_frontoffice_url()
registration_url = misc.get_variadic_url(
get_cfg('saml_identities', {}).get('registration-url'),

2
wcs/wscalls.py
View File

@ -43,7 +43,7 @@ def call_webservice(url, qs_data=None, request_signature_key=None,
url = url.strip()
if Template.is_template_string(url):
variables = get_publisher().substitutions.get_context_variables()
variables = get_publisher().substitutions.get_context_variables(mode='lazy')
url = get_variadic_url(url, variables)
if not request_signature_key: