Peter M. Groen / knowledgetree

Commit deadab7a1f12e8057e94a8f60f69ff2d62768984

Authored by bshuttle
1 parent bdd7fd04

improve the workflow-state overview, make it consistent between edit and view. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4816 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
templates/ktcore/workflow/editWorkflow.smarty
  View file @deadab7
@@ -22,23 +22,24 @@ @@ -22,23 +22,24 @@
22 workflow. To modify items, either select them from the overview below, 22 workflow. To modify items, either select them from the overview below,
23 or use the "Workflow" menu on the left to create new ones.{/i18n}</p> 23 or use the "Workflow" menu on the left to create new ones.{/i18n}</p>
24 24
25 -{if (empty($aStates))}  
26 -<div class="ktInfo"><p>This workflow does not define any states. Please use the  
27 -Workflow menu (on the left) to create new states.</p></div> 25 +{if (empty($workflow_info.states))}
  26 +<div class="ktInfo"><p>This workflow does not define any states.</p></div>
28 {else} 27 {else}
29 <ul id="workflow-states-list"> 28 <ul id="workflow-states-list">
30 -{foreach item=oState from=$aStates} 29 +{foreach item=oState from=$workflow_info.states}
31 <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a> 30 <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
  31 + {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
32 <ul> 32 <ul>
33 - <li>{i18n}Notified groups &amp; roles:{/i18n} 33 + <li>{i18n}Notified groups & roles:{/i18n}
34 {$context->getNotificationStringForState($oState)} 34 {$context->getNotificationStringForState($oState)}
35 </li> 35 </li>
  36 +
36 <li>{i18n}Controlled Actions available: {/i18n} 37 <li>{i18n}Controlled Actions available: {/i18n}
37 {$context->getActionStringForState($oState)} 38 {$context->getActionStringForState($oState)}
38 </li> 39 </li>
39 40
40 <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li> 41 <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li>
41 - 42 +
42 <li>{i18n}Transitions available: {/i18n} 43 <li>{i18n}Transitions available: {/i18n}
43 {$context->getTransitionFromStringForState($oState)} 44 {$context->getTransitionFromStringForState($oState)}
44 </li> 45 </li>
templates/ktcore/workflow/manageStates.smarty
  View file @deadab7
@@ -27,17 +27,17 @@ various different states for documents.&lt;/p&gt; @@ -27,17 +27,17 @@ various different states for documents.&lt;/p&gt;
27 <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a> 27 <li><span class="workflow_element">State:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
28 {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if} 28 {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
29 <ul> 29 <ul>
30 - <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Notified groups & roles:{/i18n}</a> 30 + <li>{i18n}Notified groups & roles:{/i18n}
31 {$context->getNotificationStringForState($oState)} 31 {$context->getNotificationStringForState($oState)}
32 </li> 32 </li>
33 33
34 - <li><a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Controlled Actions available: {/i18n}</a> 34 + <li>{i18n}Controlled Actions available: {/i18n}
35 {$context->getActionStringForState($oState)} 35 {$context->getActionStringForState($oState)}
36 </li> 36 </li>
37 37
38 <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li> 38 <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li>
39 39
40 - <li><a href="{addQS}action=editTransitions&fWorkflowId={$oWorkflow->getId()}{/addQS}">{i18n}Transitions available: {/i18n}</a> 40 + <li>{i18n}Transitions available: {/i18n}
41 {$context->getTransitionFromStringForState($oState)} 41 {$context->getTransitionFromStringForState($oState)}
42 </li> 42 </li>
43 43