Peter M. Groen / knowledgetree

Commit 51b00b6c2840f5945df6c9ce932fd0f620a9bdbb

Authored by kevin_fourie
1 parent 83fb4be9

Merged in from STABLE trunk... 

KTS-1654
"Activate Graphviz version of workflow"
Commented this out completely as it will be replaced completely in future.

Committed By: Kevin
Reviewed By: Conrad

KTS-1617
"Disabled workflow still works"
Fixed.

Committed By: Kevin
Reviewed By: Jalaloedien

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6678 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
plugins/ktcore/KTDocumentActions.php
  View file @51b00b6
... ... @@ -1341,7 +1341,7 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
1341 1341 $oUser =& User::get($_SESSION['userID']);
1342 1342 $aTransitions = KTWorkflowUtil::getTransitionsForDocumentUser($oDocument, $oUser);
1343 1343  
1344   - $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL');
  1344 + $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL AND enabled = 1 ');
1345 1345  
1346 1346 $bHasPerm = false;
1347 1347 if (KTPermissionUtil::userHasPermissionOnItem($oUser, 'ktcore.permissions.workflow', $oDocument)) {
... ...
plugins/ktcore/admin/workflowsv2.php
  View file @51b00b6
... ... @@ -130,12 +130,12 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
130 130 }
131 131  
132 132 $this->HAVE_GRAPHVIZ = false;
133   - $dotCommand = KTUtil::findCommand("ui/dot", 'dot');
  133 +/* $dotCommand = KTUtil::findCommand("ui/dot", 'dot');
134 134 if (!empty($dotCommand)) {
135 135 $this->HAVE_GRAPHVIZ = true;
136 136 $this->dotCommand = $dotCommand;
137 137 }
138   -
  138 +*/
139 139 }
140 140  
141 141 function do_main() {
... ...
templates/ktcore/workflow/admin/view.smarty
  View file @51b00b6
... ... @@ -13,5 +13,5 @@ about states, transitions, security and notifications as they apply to this work
13 13 <iframe src="{addQS context=$context}action=graphrepresentation{/addQS}" style="width: 100%; height: 400px; border: 1px solid black;" />
14 14 {* <img src="{addQS context=$context}action=graphrepresentation{/addQS}" /> *}
15 15 {else}
16   -<div class="ktInfoMessage"><span>{i18n}Install the GraphViz module to get a useful visualisation of your graph here.{/i18n}</span></div>
  16 +{* <div class="ktInfoMessage"><span>{i18n}Install the GraphViz module to get a useful visualisation of your graph here.{/i18n}</span></div> *}
17 17 {/if}
... ...