fix for KTS-1199

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5753 c91229c3-7414-0410-bfa2-8a42b809f60b

fix for KTS-1199
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5753 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 92059a21
Showing 5 changed files with 12 additions and 9 deletions
plugins/ktcore/KTWorkflowTriggers.inc.php
templates/ktcore/workflowtriggers/condition.smarty
templates/ktcore/workflowtriggers/group.smarty
templates/ktcore/workflowtriggers/permissions.smarty
templates/ktcore/workflowtriggers/roles.smarty
@@ -71,12 +71,18 @@ class PermissionGuardTrigger extends KTWorkflowTrigger {
         $aPermissions = KTPermission::getList();
         $aKeyPermissions = array();
         foreach ($aPermissions as $oPermission) { $aKeyPermissions[$oPermission->getName()] = $oPermission; }
+        
+        $current_perms = array();
+        foreach ($this->aConfig['perms'] as $sPermName) {
+            $current_perms[$sPermName] = true;
+        }
         $oTemplating =& KTTemplating::getSingleton();
 		$oTemplate = $oTemplating->loadTemplate("ktcore/workflowtriggers/permissions");
 		$aTemplateData = array(
               "context" => $this,
               "perms" => $aKeyPermissions,
+              'current_perms' => $current_perms, 
               'args' => $args,
 		);
 		return $oTemplate->render($aTemplateData);    
@@ -369,7 +375,7 @@ class ConditionGuardTrigger extends KTWorkflowTrigger {
 		$aTemplateData = array(
               "context" => $this,
               "conditions" => $aKeyedConditions,
-              "current_group" => KTUtil::arrayGet($this->aConfig, 'group_id'),
+              "current_condition" => KTUtil::arrayGet($this->aConfig, 'condition_id'),
               'args' => $args,
 		);
 		return $oTemplate->render($aTemplateData);    
@@ -14,7 +14,7 @@
 {* FIXME keep old selection *}
 {foreach from=$conditions item=sConditionName key=iConditionId}
-   <input type="radio" name="condition_id" value="{$iConditionId}" /> {i18n}{$sConditionName}{/i18n} <br />
+   <input type="radio" name="condition_id" value="{$iConditionId}"  {if ($iConditionId == $current_condition)}checked="true"{/if} /> {i18n}{$sConditionName}{/i18n} <br />
 {/foreach}
 <div class="form_action">
@@ -14,7 +14,7 @@
 {* FIXME keep old selection *}
 {foreach from=$groups item=sGroupName key=iGroupId}
-   <input type="radio" name="group_id" value="{$iGroupId}" /> {i18n}{$sGroupName}{/i18n} <br />
+   <input type="radio" name="group_id" value="{$iGroupId}" {if ($iGroupId == $current_group)}checked="true"{/if}  /> {i18n}{$sGroupName}{/i18n} <br />
 {/foreach}
 <div class="form_action">
@@ -12,15 +12,12 @@
 <p class="descriptiveText">{i18n}Specify which permissions the user will require in order to perform this transition.  Note that 
 the user will be required to have <strong>all</strong> these permissions.{/i18n}</p>
-{* FIXME keep old selection *}
-
-{foreach from=$perms item=oPerm}
-   <input type="checkbox" name="trigger_perms[{$oPerm->getName()}]" /> {i18n}{$oPerm->getHumanName()}{/i18n} <br />
+{foreach from=$perms item=oPerm key=sPermName}
+   <input type="checkbox" name="trigger_perms[{$sPermName}]" {if ($current_perms.$sPermName)}checked="true"{/if}/> {i18n}{$oPerm->getHumanName()}{/i18n} <br />
 {/foreach}
 <div class="form_action">
     <input type="submit" value="{i18n}Save Trigger{/i18n}" />
-    {* FIXME how do I cancel again? *}
 </div>
 </fieldset>
 </form>
 \ No newline at end of file
@@ -14,7 +14,7 @@
 {* FIXME keep old selection *}
 {foreach from=$roles item=sRoleName key=iRoleId}
-   <input type="radio" name="role_id" value="{$iRoleId}" /> {i18n}{$sRoleName}{/i18n} <br />
+   <input type="radio" name="role_id" value="{$iRoleId}" {if ($iRoleId == $current_role)}checked="true"{/if} /> {i18n}{$sRoleName}{/i18n} <br />
 {/foreach}
 <div class="form_action">