Commit 27a14b52 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

in ignore_layout case, do nothing special in BeforeTraverse hook. with this...

in ignore_layout case, do nothing special in BeforeTraverse hook. with this change, next/previous selection works fine, and redirection after changing id works fine etc.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26391 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3edb4117
...@@ -63,6 +63,10 @@ class WebSiteTraversalHook(Persistent): ...@@ -63,6 +63,10 @@ class WebSiteTraversalHook(Persistent):
# Only consider Web Site for absolute_url # Only consider Web Site for absolute_url
request = getattr(self, '_v_request', None) request = getattr(self, '_v_request', None)
if request is None: request = self._v_request = get_request() if request is None: request = self._v_request = get_request()
# In ignore_layout case, we only remove empty element from path
# XXX more support required for ignore_layout?
if request.get('ignore_layout', None):
return tuple([x for x in path if x])
website_path = request.get(WEBSITE_KEY, None) website_path = request.get(WEBSITE_KEY, None)
select_language = request.get(WEBSITE_LANGUAGE_KEY, None) select_language = request.get(WEBSITE_LANGUAGE_KEY, None)
if website_path: if website_path:
...@@ -73,7 +77,6 @@ class WebSiteTraversalHook(Persistent): ...@@ -73,7 +77,6 @@ class WebSiteTraversalHook(Persistent):
# Search for the common part index # Search for the common part index
# XXX more testing should be added to check # XXX more testing should be added to check
# if the URL is the kind of URL which is a Web Site # if the URL is the kind of URL which is a Web Site
# XXX more support required for ignore_layout
common_index = 0 common_index = 0
i = 0 i = 0
path_len = len(path) path_len = len(path)
......
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