Commit 3139217b authored by Aurel's avatar Aurel

modify asSqlExpression and asSqlJoinExpression to take into account

that domains are store as path in selection


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@5794 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent ffa782d8
...@@ -173,7 +173,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent): ...@@ -173,7 +173,7 @@ class Selection(Acquisition.Implicit, Traversable, Persistent):
setattr(self, k, v) setattr(self, k, v)
def __call__(self, method = None, context=None, REQUEST=None): def __call__(self, method = None, context=None, REQUEST=None):
#LOG("Selection", 0, str(self.__dict__)) #LOG("Selection", 0, str((self.__dict__))
#LOG("Selection", 0, str(method)) #LOG("Selection", 0, str(method))
#LOG('Selection', 0, "self.invert_mode = %s" % repr(self.invert_mode)) #LOG('Selection', 0, "self.invert_mode = %s" % repr(self.invert_mode))
if self.invert_mode is 0: if self.invert_mode is 0:
...@@ -402,6 +402,10 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent): ...@@ -402,6 +402,10 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent):
join_table="catalog", join_column="uid"): join_table="catalog", join_column="uid"):
select_expression = [] select_expression = []
for k, d in self.domain_dict.items(): for k, d in self.domain_dict.items():
if isinstance(d, str):
# get the domain object
site = self.getPortalObject()
d = site['portal_domains'].getDomainByPath(d)
if k == 'parent': if k == 'parent':
# Special treatment for parent # Special treatment for parent
select_expression.append(d.getParentSqlExpression(table='catalog', select_expression.append(d.getParentSqlExpression(table='catalog',
...@@ -431,6 +435,10 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent): ...@@ -431,6 +435,10 @@ class DomainSelection(Acquisition.Implicit, Traversable, Persistent):
join_expression = [] join_expression = []
#LOG('DomainSelection', 0, 'domain_id = %r, exclude_domain_id = %r, self.domain_dict = %r' % (domain_id, exclude_domain_id, self.domain_dict)) #LOG('DomainSelection', 0, 'domain_id = %r, exclude_domain_id = %r, self.domain_dict = %r' % (domain_id, exclude_domain_id, self.domain_dict))
for k, d in self.domain_dict.items(): for k, d in self.domain_dict.items():
if isinstance(d, str):
# we must the domain
site = self.getPortalObject()
d = site['portal_domains'].getDomainByPath(d)
if k == 'parent': if k == 'parent':
pass pass
elif k is not None: elif k is not None:
......
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