Changeset 750 for ZMS/trunk/_workflowmanager.py

Timestamp:

23.10.2009 16:12:55 (3 years ago)

Author:

chris

Message:

zms-2.11.4-01

File:

• ZMS/trunk/_workflowmanager.py (modified) (7 diffs)

ZMS/trunk/_workflowmanager.py

@@ -68 +68 @@
 # ------------------------------------------------------------------------------
 def initConf(self, filename, REQUEST):
-  filepath = package_home(globals())+'/import/'
-  xmlfile = open(_fileutil.getOSPath(filepath+filename),'rb')
+  xmlfile = open(_fileutil.getOSPath(filename),'rb')
   importXml(self, xmlfile, REQUEST)
   # Return filename.
@@ -165 +164 @@
 #  _workflowmanager.setWfActivity
 # ------------------------------------------------------------------------------
-def setWfActivity(self, id, newId, newName, newIcon=None, newEditable=1):
+def setWfActivity(self, id, newId, newName, newIcon=None):
   obs = self.getConfProperty(CONF_ACTIVITIES,[])
   # Remove exisiting entry.
@@ -178 +177 @@
   newValues['name'] = newName
   newValues['icon'] = newIcon
-  newValues['editable'] = newEditable
   # Update attribute.
   obs.insert(i,newValues)
@@ -428 +426 @@
         if wfTransition['to'] is not None and len(wfTransition['to']) > 0 and id in wfTransition['to']:
           for ac_id in wfTransition['from']:
-            idx = ids.index(ac_id)
-            if idx not in froms:
-              froms.append(idx)
+            if ac_id in ids:
+              idx = ids.index(ac_id)
+              if idx not in froms:
+                froms.append(idx)
         if wfTransition['from'] is not None and len(wfTransition['from']) > 0 and id in wfTransition['from']:
           for ac_id in wfTransition['to']:
-            idx = ids.index(ac_id)
-            if idx not in tos:
-              tos.append(idx)
+            if ac_id in ids:
+              idx = ids.index(ac_id)
+              if idx not in tos:
+                tos.append(idx)
       froms.sort()
       tos.sort()
@@ -537 +537 @@
           else:
             newIcon = _blobfields.createBlobField(self,_globals.DT_IMAGE,newIcon)
-        newEditable = REQUEST.get('inpEditable',0)
-        id = setWfActivity(self, item.get('id',None), newId, newName, newIcon, newEditable)
+        id = setWfActivity(self, item.get('id',None), newId, newName, newIcon)
         message = self.getZMILangStr('MSG_CHANGED')
       
@@ -559 +558 @@
           else:
             newIcon = _blobfields.createBlobField(self,_globals.DT_IMAGE,newIcon)
-        newEditable = REQUEST.get('newEditable',0)
-        id = setWfActivity(self, item.get('id',None), newId, newName, newIcon, newEditable)
+        id = setWfActivity(self, item.get('id',None), newId, newName, newIcon)
         message = self.getZMILangStr('MSG_INSERTED')%id
       
@@ -614 +612 @@
         newId = REQUEST.get('newId').strip()
         newName = REQUEST.get('newName').strip()
-        newFrom = REQUEST.get('newFrom')
-        newTo = REQUEST.get('newTo')
+        newFrom = REQUEST.get('newFrom',[])
+        newTo = REQUEST.get('newTo',[])
         newPerformer = REQUEST.get('newPerformer',[])
         newDtml = REQUEST.get('newDtml','').strip()