Fix for KTS-1049: moving a document resets the state of the workflow.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5537 c91229c3-7414-0410-bfa2-8a42b809f60b

Fix for KTS-1049: moving a document resets the state of the workflow.
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5537 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 729faaee
Showing 2 changed files with 11 additions and 1 deletions
lib/workflow/workflowutil.inc.php
plugins/ktstandard/KTWorkflowAssociation.php
@@ -114,7 +114,17 @@ class KTWorkflowUtil {
     // }}}
+    /* WILL NOT RESET THE WORKFLOW if changing to the -same- workflow */
     function changeWorkflowOnDocument($oWorkflow, $oDocument) {
+        $oDocument =& KTUtil::getObject('Document', $oDocument);
+            
+        // fix for 1049: workflows reset on document move.
+        // this was the original purpose of "changeWorkflowOnDocument".
+        
+        if ($oDocument->getWorkflowId() == $oWorkflow->getId()) {
+            return true; // bail out, essentially.
+        }    
+    
         return KTWorkflowUtil::startWorkflowOnDocument($oWorkflow, $oDocument);
     }
     // {{{ startWorkflowOnDocument
@@ -110,7 +110,7 @@ class KTWADAddTrigger extends KTWorkflowAssociationDelegator {
             return ;          
         }
-        $ret = KTWorkflowUtil::startWorkflowOnDocument($oWorkflow, $this->_document);
+        $ret = KTWorkflowUtil::changeWorkflowOnDocument($oWorkflow, $this->_document);
     }
 }