Skip to content
Snippets Groups Projects
Commit 701eb140 authored by Tim Steiner's avatar Tim Steiner
Browse files

Fix some bugs related to selecting N/A on the ApprovalChainManager

parent e1901bfe
No related branches found
Tags
No related merge requests found
......@@ -170,6 +170,8 @@ class ApprovalChainManagerController extends Nmc_Controller_Action
$currentLink->currentAction = $currentAction;
if ($currentLinkData['currentState'] != '_null') {
$currentLink->currentState = $currentLinkData['currentState'];
} else {
$currentLink->currentState = null;
}
$currentLink->nextAction = $nextAction;
$currentLink->save();
......
......@@ -11,6 +11,7 @@ var actionTypeSelectAjaxResponder = AjaxClient.extend(
}
this.selectElement.options.length = 0;
this.selectElement.add(new Option('--N/A--', '_null', false, false), null);
for (var i = 0; i < resultStrings.length; i++) {
var resultString = resultStrings[i]
this.selectElement.add(new Option(resultString, resultString, false, false), null);
......@@ -166,7 +167,7 @@ function updateActionResults()
{
var actionResultElement = this.parentNode;
for(actionResultElement = actionResultElement.nextSibling;
actionResultElement.nodeName != 'TD';
actionResultElement.nodeName != 'td';
actionResultElement = actionResultElement.nextSibling);
actionResultElement = actionResultElement.getElementsByTagName('select').item(0);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment