cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

service management bug fixes

Browse source 
git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@2244 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2007-12-14 15:13:33 +00:00
parent 6b05dbd416
commit 029d097eb5
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
composer/message/instance.py
View file

@ -31,6 +31,7 @@ try:
zope29 = False zope29 = False
except ImportError: except ImportError:
from zope.app.traversing.browser.absoluteurl import absoluteURL from zope.app.traversing.browser.absoluteurl import absoluteURL
from Acquisition import aq_parent, aq_inner
zope29 = True zope29 = True
from cybertools.composer.instance import Instance from cybertools.composer.instance import Instance
@ -51,8 +52,8 @@ class MessageInstance(Instance):
if data is None: if data is None:
data = {} data = {}
request = data.get('request') or TestRequest() request = data.get('request') or TestRequest()
# if 'url' not in data: if 'url' not in data:
data['url'] = self.getClientUrl(request) data['url'] = self.getClientUrl(request)
dp = DataProvider(self, data) dp = DataProvider(self, data)
text = MessageTemplate(self.template.text).safe_substitute(dp) text = MessageTemplate(self.template.text).safe_substitute(dp)
subject = self.template.subjectLine subject = self.template.subjectLine
@ -63,7 +64,12 @@ class MessageInstance(Instance):
if self.client is None: if self.client is None:
return '' return ''
if zope29: if zope29:
path = self.client.manager.getPhysicalPath()[:-3] #path = aq_inner(self.client.manager).getPhysicalPath()
path = self.client.manager.getPhysicalPath()
if len(path) >= 3 and path[-3] == 'sm_clients':
print '*** path correction:', path
# evil hack for aqcuisition-wrapped manager object
path = path[:-3]
url = request.physicalPathToURL(path) url = request.physicalPathToURL(path)
else: else:
url = absoluteURL(self.client.manager, request) url = absoluteURL(self.client.manager, request)
@ -103,9 +109,7 @@ class DataProvider(object):
elif key in messageManager.messages: elif key in messageManager.messages:
mi = MessageInstance(client, messageManager.messages[key], mi = MessageInstance(client, messageManager.messages[key],
messageManager) messageManager)
return mi.applyTemplate()['text'] return mi.applyTemplate(self.data)['text']
# TODO: use available data, esp request
#return mi.applyTemplate(self.data)['text']
elif '.' in key: elif '.' in key:
if client is None: if client is None:
return '$' + key return '$' + key