Commit 9ae9d984 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_jio: Fix test by following up maintream.

parent bd93529d
...@@ -15,7 +15,7 @@ url_template_dict = { ...@@ -15,7 +15,7 @@ url_template_dict = {
"{&relative_url,view}", "{&relative_url,view}",
"search_template": "%(root_url)s/%(script_id)s?mode=search" + \ "search_template": "%(root_url)s/%(script_id)s?mode=search" + \
"{&query,select_list*,limit*}", "{&query,select_list*,limit*}",
"new_content_action": "%(root_url)s/%(script_id)s?mode=newContent", "new_content_action": "%(root_isurl)s/%(script_id)s?mode=newContent",
# XXX View is set by default to empty # XXX View is set by default to empty
"document_hal": "%(root_url)s/%(script_id)s?mode=traverse" + \ "document_hal": "%(root_url)s/%(script_id)s?mode=traverse" + \
"&relative_url=%(relative_url)s", "&relative_url=%(relative_url)s",
...@@ -279,7 +279,8 @@ portal = context.getPortalObject() ...@@ -279,7 +279,8 @@ portal = context.getPortalObject()
sql_catalog = portal.portal_catalog.getSQLCatalog() sql_catalog = portal.portal_catalog.getSQLCatalog()
# Calculate the site root to prevent unexpected browsing # Calculate the site root to prevent unexpected browsing
is_web_mode = (context.REQUEST.get('current_web_section', None) is not None) or context.isWebMode() is_web_mode = (context.REQUEST.get('current_web_section', None) is not None) or (hasattr(context, 'isWebMode') and context.isWebMode())
# is_web_mode = traversed_document.isWebMode() # is_web_mode = traversed_document.isWebMode()
if is_web_mode: if is_web_mode:
site_root = context.getWebSiteValue() site_root = context.getWebSiteValue()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment