Changeset 1107 for ZMS/trunk/_versionmanager.py

Timestamp:

14.07.2010 20:56:17 (23 months ago)

Author:

zmsdev

Message:

Added support for retrieval of user-objects as recipients (requested by uni-be).

File:

• ZMS/trunk/_versionmanager.py (modified) (3 diffs)

ZMS/trunk/_versionmanager.py

@@ -1117 +1117 @@
     # --------------------------------------------------------------------------
     def getRecipientWf(self, REQUEST=None):
+      raw = self.getConfProperty('zms._versionmanager.getRecipientWf.raw',0)!=0
       recipient = ''
       name = self.getObjProperty('work_uid',REQUEST)
-      mto = self.getUserAttr(name,'email','')
-      if len(mto) > 0:
-        recipient = name + ' <' + mto + '>'
+      if raw:
+        userObj = self.findUser(name)
+        recipient = userObj
+      else:
+        mto = self.getUserAttr(name,'email','')
+        if len(mto) > 0:
+          recipient = name + ' <' + mto + '>'
       return recipient
     
@@ -1128 +1133 @@
     # --------------------------------------------------------------------------
     def getRecipientsByRole(self, roles=['ZMSEditor'], REQUEST=None):
-      recipients = ''
+      raw = self.getConfProperty('zms._versionmanager.getRecipientsByRole.raw',0)!=0
+      recipients = []
       langs = [REQUEST['lang']]
       ob = self
@@ -1136 +1142 @@
           userObj = self.findUser(name)
           mto = self.getUserAttr(name,'email','')
-          if userObj is not None and \
-             len(mto) > 0 and \
+          if userObj is not None and len(mto) > 0 and \
              len(self.intersection_list(roles, ob.getUserRoles(userObj, aq_parent=0))) > 0 and \
              len(self.intersection_list(langs, ob.getUserLangs(userObj, aq_parent=0))) > 0:
-            if len(recipients) > 0:
-              recipients += ', '
-            recipients += name + ' <' + mto + '>'
+            if raw:
+              recipients.append( userObj)
+            else:
+              recipients.append( name + ' <' + mto + '>')
         ob = ob.getParentNode()
-      return recipients
+      if raw:
+        return recipients
+      return ', '.join( recipients)
 
     """