Commit a753fdbc authored by Sebastien Robin's avatar Sebastien Robin

update generateGidFromObject

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1867 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e3f4af0f
...@@ -852,12 +852,20 @@ class Subscription(Folder, SyncCode): ...@@ -852,12 +852,20 @@ class Subscription(Folder, SyncCode):
LOG('getGidFromObject',0,'gidgenerator : %s' % repr(self.getGidGenerator())) LOG('getGidFromObject',0,'gidgenerator : %s' % repr(self.getGidGenerator()))
gid_gen = self.getGidGenerator() gid_gen = self.getGidGenerator()
if callable(gid_gen): if callable(gid_gen):
LOG('getGidFromObject gid_generator',0,'is callable')
o_gid=gid_gen(object) o_gid=gid_gen(object)
LOG('getGidFromObject',0,'o_gid: %s' % repr(o_gid))
elif hasattr(o_base, gid_gen): elif hasattr(o_base, gid_gen):
LOG('getGidFromObject',0,'there is the gid generator') LOG('getGidFromObject',0,'there is the gid generator on o_base')
generator = getattr(object, self.getGidGenerator()) generator = getattr(object, gid_gen)
o_gid = generator() o_gid = generator()
LOG('getGidFromObject',0,'o_gid: %s' % repr(o_gid)) LOG('getGidFromObject',0,'o_gid: %s' % repr(o_gid))
elif gid_gen is not None:
# It might be a script python
LOG('getGidFromObject',0,'there is the gid generator')
generator = getattr(object,gid_gen)
o_gid = generator(object=object)
LOG('getGidFromObject',0,'o_gid: %s' % repr(o_gid))
return o_gid return o_gid
def getObjectFromGid(self, gid): def getObjectFromGid(self, gid):
......
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