Peter M. Groen / knowledgetree

Commit ff18f093a3e0ea3f460de5936544323b352e3ea2

Authored by bshuttle
1 parent a2a49fd0

disabled workflows should not auto-assign. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4732 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 19 additions and 1 deletions
plugins/ktstandard/KTWorkflowAssociation.php
  View file @ff18f09
... ... @@ -70,6 +70,12 @@ class KTWorkflowAssociationDelegator {
70 70 class KTWADAddTrigger extends KTWorkflowAssociationDelegator {
71 71 function postValidate() {
72 72 $oWorkflow = $this->_handler->addTrigger($this->_document);
  73 +
  74 + // catch disabled workflows.
  75 + if ($oWorkflow->getStartStateId() === null) {
  76 + return ;
  77 + }
  78 +
73 79 $ret = KTWorkflowUtil::startWorkflowOnDocument($oWorkflow, $this->_document);
74 80 }
75 81 }
... ... @@ -78,6 +84,12 @@ class KTWADAddTrigger extends KTWorkflowAssociationDelegator {
78 84 class KTWADEditTrigger extends KTWorkflowAssociationDelegator {
79 85 function postValidate() {
80 86 $oWorkflow = $this->_handler->editTrigger($this->_document);
  87 +
  88 + // catch disabled workflows.
  89 + if ($oWorkflow->getStartStateId() === null) {
  90 + return ;
  91 + }
  92 +
81 93 $ret = KTWorkflowUtil::changeWorkflowOnDocument($oWorkflow, $this->_document);
82 94 }
83 95 }
... ... @@ -86,6 +98,12 @@ class KTWADEditTrigger extends KTWorkflowAssociationDelegator {
86 98 class KTWADMoveTrigger extends KTWorkflowAssociationDelegator {
87 99 function postValidate() {
88 100 $oWorkflow = $this->_handler->moveTrigger($this->_document);
  101 +
  102 + // catch disabled workflows.
  103 + if ($oWorkflow->getStartStateId() === null) {
  104 + return ;
  105 + }
  106 +
89 107 $ret = KTWorkflowUtil::changeWorkflowOnDocument($oWorkflow, $this->_document);
90 108 }
91 109 }
... ...
plugins/ktstandard/workflow/TypeAssociator.php
  View file @ff18f09
... ... @@ -66,7 +66,7 @@ class WorkflowTypeAllocationDispatcher extends KTAdminDispatcher {
66 66 $sQuery = 'SELECT document_type_id, workflow_id FROM ' . KTUtil::getTableName('type_workflow_map');
67 67 $aParams = array();
68 68 $res = DBUtil::getResultArray(array($sQuery, $aParams));
69   - $aWorkflows = KTWorkflow::getList();
  69 + $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL');
70 70 $aTypes = DocumentType::getList();
71 71  
72 72 $aTypeMapping = array();
... ...