Peter M. Groen / knowledgetree

Commit 82216730efe921c6b3b4263c61b9cfba47c1603d

Authored by bshuttle
1 parent acd1f6ea

handle the case where triggers have no configuration. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5652 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
lib/workflow/workflowtrigger.inc.php
  View file @8221673
... ... @@ -41,6 +41,7 @@ class KTWorkflowTrigger {
41 41 // generic requirements - both can be true
42 42 var $bIsGuard = false;
43 43 var $bIsAction = false;
  44 + var $bIsConfigurable = true;
44 45  
45 46 function KTWorkflowTrigger() {
46 47 $this->_oTriggerState = null; // initialise to initial state
... ... @@ -75,7 +76,7 @@ class KTWorkflowTrigger {
75 76 }
76 77  
77 78 // perform more expensive checks -before- performTransition.
78   - function precheckTrigger($oDocument, $oUser) {
  79 + function precheckTransition($oDocument, $oUser) {
79 80 return true;
80 81 }
81 82  
... ...
templates/ktcore/workflow/editTransition.smarty
  View file @8221673
... ... @@ -71,7 +71,7 @@ requirement.{/i18n}</p>
71 71 <tr>
72 72 <td>{$oTrigger->getName()}</td>
73 73 <td>{$oTrigger->getConfigDescription()}</td>
74   - <td><a class="ktAction ktEdit" href="{addQS}action=editTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">edit</a></td>
  74 + <td>{if $oTrigger->bIsConfigurable}<a class="ktAction ktEdit" href="{addQS}action=editTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">edit</a>{else}&mdash;{/if}</td>
75 75 <td><a class="ktAction ktDelete" href="{addQS}action=deleteTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">delete</a></td>
76 76 </tr>
77 77 {/foreach}
... ... @@ -100,8 +100,8 @@ requirement.{/i18n}&lt;/p&gt;
100 100 <tr>
101 101 <td>{$oTrigger->getName()}</td>
102 102 <td>{$oTrigger->getConfigDescription()}</td>
103   - <td><a href="{addQS}action=editTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">edit</a></td>
104   - <td>x</td>
  103 + <td>{if $oTrigger->bIsConfigurable}<a class="ktAction ktEdit" href="{addQS}action=editTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">edit</a>{else}&mdash;{/if}</td>
  104 + <td><a class="ktAction ktDelete" href="{addQS}action=deleteTrigger&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}&fTriggerInstanceId={$oTrigger->getConfigId()}{/addQS}">delete</a></td>
105 105 </tr>
106 106 {/foreach}
107 107 </tbody>
... ...