Peter M. Groen / knowledgetree

Commit ebd3324c5b50e118bf7b22bf061397c2c3d97538

Authored by Megan Watson
1 parent a17bb2f3

KTC-565 

"Disabling the automatic workflow associated with a document type does not stop it from being assigned to a new document."
Fixed. Added a check to only get enabled workflows.

Committed by: Megan Watson
Reviewed by: Jonathan Byrne



git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8742 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 13 additions and 10 deletions
plugins/ktstandard/workflow/TypeAssociator.php
  View file @ebd3324
... ... @@ -6,31 +6,31 @@
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9   - *
  9 + *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
12 12 * Free Software Foundation.
13   - *
  13 + *
14 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 17 * details.
18   - *
  18 + *
19 19 * You should have received a copy of the GNU General Public License
20 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21   - *
22   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 23 * California 94120-7775, or email info@knowledgetree.com.
24   - *
  24 + *
25 25 * The interactive user interfaces in modified source and object code versions
26 26 * of this program must display Appropriate Legal Notices, as required under
27 27 * Section 5 of the GNU General Public License version 3.
28   - *
  28 + *
29 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33   - * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 34 * copyright notice.
35 35 * Contributor( s): ______________________________________
36 36 *
... ... @@ -97,8 +97,11 @@ class DocumentTypeWorkflowAssociator extends KTWorkflowAssociationHandler {
97 97 function getWorkflowForType($iDocTypeId, $oDocument) {
98 98 if (is_null($iDocTypeId)) { return null; }
99 99  
  100 + // Link to the workflows table to ensure disabled workflows aren't associated
100 101 $sQuery = 'SELECT `workflow_id` FROM ' . KTUtil::getTableName('type_workflow_map');
101   - $sQuery .= ' WHERE `document_type_id` = ?';
  102 + $sQuery .= ' LEFT JOIN workflows w ON w.id = m.workflow_id
  103 + WHERE document_type_id = ? AND w.enabled = 1';
  104 +
102 105 $aParams = array($iDocTypeId);
103 106 $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'workflow_id');
104 107  
... ...