Peter M. Groen / knowledgetree

Commit b882035925f52d8b1331cd503c06c7df674c1b75

Authored by kevin_fourie
1 parent 9d445a56

KTS-2187 

"Still possible to select a disabled workflow in automatic workflow dropdown"
Fixed. Added a check for enabled.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6989 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
plugins/ktstandard/workflow/FolderAssociator.php
  View file @b882035
@@ -100,7 +100,7 @@ class FolderWorkflowAssignmentFolderAction extends KTFolderAction { @@ -100,7 +100,7 @@ class FolderWorkflowAssignmentFolderAction extends KTFolderAction {
100 $oTemplate =& $this->oValidator->validateTemplate('ktstandard/workflow/folderconfigure'); 100 $oTemplate =& $this->oValidator->validateTemplate('ktstandard/workflow/folderconfigure');
101 $fields = array(); 101 $fields = array();
102 102
103 - $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL'); 103 + $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL AND enabled = 1');
104 $aVocab = array(); 104 $aVocab = array();
105 $aVocab[] = _kt('No automatic workflow.'); 105 $aVocab[] = _kt('No automatic workflow.');
106 foreach ($aWorkflows as $oWorkflow) { 106 foreach ($aWorkflows as $oWorkflow) {
plugins/ktstandard/workflow/TypeAssociator.php
  View file @b882035
@@ -101,7 +101,7 @@ class WorkflowTypeAllocationDispatcher extends KTAdminDispatcher { @@ -101,7 +101,7 @@ class WorkflowTypeAllocationDispatcher extends KTAdminDispatcher {
101 $sQuery = 'SELECT document_type_id, workflow_id FROM ' . KTUtil::getTableName('type_workflow_map'); 101 $sQuery = 'SELECT document_type_id, workflow_id FROM ' . KTUtil::getTableName('type_workflow_map');
102 $aParams = array(); 102 $aParams = array();
103 $res = DBUtil::getResultArray(array($sQuery, $aParams)); 103 $res = DBUtil::getResultArray(array($sQuery, $aParams));
104 - $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL'); 104 + $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL AND enabled = 1');
105 $aTypes = DocumentType::getList(); 105 $aTypes = DocumentType::getList();
106 106
107 $aTypeMapping = array(); 107 $aTypeMapping = array();