Commit 411cb7f8 authored by Jean-Paul Smets's avatar Jean-Paul Smets

getDomainByPath can now accept a default parameter so that a defaultvalue is...

getDomainByPath can now accept a default parameter so that a defaultvalue is returned in case of exception. This is used for example in Listbox.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15217 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 36c6e1aa
...@@ -35,6 +35,8 @@ from Products.ERP5Type.Tool.BaseTool import BaseTool ...@@ -35,6 +35,8 @@ from Products.ERP5Type.Tool.BaseTool import BaseTool
from zLOG import LOG from zLOG import LOG
from DateTime import DateTime from DateTime import DateTime
_MARKER = []
class DomainTool(BaseTool): class DomainTool(BaseTool):
""" """
A tool to define reusable ranges and subranges through A tool to define reusable ranges and subranges through
...@@ -291,13 +293,18 @@ class DomainTool(BaseTool): ...@@ -291,13 +293,18 @@ class DomainTool(BaseTool):
object_list.extend(parent.getDomainGeneratorList(**kw)) object_list.extend(parent.getDomainGeneratorList(**kw))
return object_list return object_list
def getDomainByPath(self, path):
def getDomainByPath(self, path, default=_MARKER):
""" """
Return the domain object for a given path Return the domain object for a given path
""" """
path = path.split('/') path = path.split('/')
base_domain_id = path[0] base_domain_id = path[0]
if default is _MARKER:
domain = self[base_domain_id] domain = self[base_domain_id]
else:
domain = self.get(base_domain_id, _MARKER)
if domain is _MARKER: return default
for depth, subdomain in enumerate(path[1:]): for depth, subdomain in enumerate(path[1:]):
domain_list = self.getChildDomainValueList(domain, depth=depth) domain_list = self.getChildDomainValueList(domain, depth=depth)
for d in domain_list: for d in domain_list:
...@@ -305,6 +312,7 @@ class DomainTool(BaseTool): ...@@ -305,6 +312,7 @@ class DomainTool(BaseTool):
domain = d domain = d
break break
else: else:
if domain is _MARKER: return default
raise KeyError, subdomain raise KeyError, subdomain
return domain return domain
......
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