Commit 6e92fe7c authored by Yoshinori Okuji's avatar Yoshinori Okuji

Allow domain_path and report_path to be set to None.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7087 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5ee4e4a2
...@@ -165,7 +165,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -165,7 +165,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
self.params[key] = params[key] self.params[key] = params[key]
if kw is not None: if kw is not None:
for k,v in kw.items(): for k,v in kw.items():
if k in ('domain', 'report') or v is not None: if k in ('domain', 'report', 'domain_path', 'report_path') or v is not None:
# XXX Because method_path is an URI, it must be in ASCII. # XXX Because method_path is an URI, it must be in ASCII.
# Shouldn't Zope automatically does this conversion? -yo # Shouldn't Zope automatically does this conversion? -yo
if k == 'method_path' and type(v) is type(u'a'): if k == 'method_path' and type(v) is type(u'a'):
...@@ -284,7 +284,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -284,7 +284,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
if self.domain_path is None: if self.domain_path is None:
if default is None: if default is None:
self.domain_path = self.getDomainList()[0] self.domain_path = self.getDomainList()[0]
else: else:
self.domain_path = default self.domain_path = default
return self.domain_path return self.domain_path
...@@ -299,10 +299,10 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -299,10 +299,10 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
if self.report_path is None: if self.report_path is None:
if default is None: if default is None:
self.report_path = self.getReportList()[0] self.report_path = self.getReportList()[0]
else: else:
self.report_path = default self.report_path = default
return self.report_path return self.report_path
security.declarePublic('getZoom') security.declarePublic('getZoom')
def getZoom(self): def getZoom(self):
try: try:
......
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