AMBARI-20655.Need to improve the grouping of the nodes available in transition section of WFM(M Madhan Mohan Reddy via padmapriyanitt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e945bb18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e945bb18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e945bb18 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: e945bb1869dd8abb71cfd1285b6a23a0df5e39f0 Parents: dca1ebd Author: padmapriyanitt <padmapriyan...@gmail.com> Authored: Tue Apr 4 11:47:45 2017 +0530 Committer: padmapriyanitt <padmapriyan...@gmail.com> Committed: Tue Apr 4 11:47:45 2017 +0530 ---------------------------------------------------------------------- .../templates/components/transition-config.hbs | 34 +++++++++++--------- 1 file changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e945bb18/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs index 83fe96c..7618481 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/transition-config.hbs @@ -19,14 +19,16 @@ <label class="control-label col-xs-2">Error To<span class="requiredField"> *</span></label> <div class=" col-xs-7"> <select onchange={{action "errorToHandler" value="target.value"}} name="select-node" class="form-control" data-show-icon="true"> - <optgroup label="Kill Nodes"></optgroup> - {{#each killNodes as |node index|}} - <option value={{node.name}} selected={{eq node.name transition.errorNode.name}}>{{node.name}}</option> - {{/each}} - <optgroup label="Other Nodes"></optgroup> - {{#each descendantNodes as |node index|}} - <option value={{node.name}} selected={{eq node.name transition.errorNode.name}}>{{node.name}}</option> - {{/each}} + <optgroup label="Kill Nodes"> + {{#each killNodes as |node index|}} + <option value={{node.name}} selected={{eq node.name transition.errorNode.name}}>{{node.name}}</option> + {{/each}} + </optgroup> + <optgroup label="Other Nodes"> + {{#each descendantNodes as |node index|}} + <option value={{node.name}} selected={{eq node.name transition.errorNode.name}}>{{node.name}}</option> + {{/each}} + </optgroup> </select> {{#if (eq transition.errorNode.type 'kill')}} <span class="kill-message">{{transition.errorNode.killMessage}}</span> @@ -37,14 +39,16 @@ <label class="control-label col-xs-2">Ok To<span class="requiredField"> *</span></label> <div class=" col-xs-7"> <select onchange={{action "okToHandler" value="target.value"}} name="select-node" class="form-control" data-show-icon="true"> - <optgroup label="Kill Nodes"></optgroup> - {{#each killNodes as |node index|}} - <option value={{node.name}} selected={{eq node.name transition.okToNode.name}}>{{node.name}}</option> - {{/each}} - <optgroup label="Other Nodes"></optgroup> - {{#each currentNode.validOkToNodes as |node index|}} + <optgroup label="Kill Nodes"> + {{#each killNodes as |node index|}} <option value={{node.name}} selected={{eq node.name transition.okToNode.name}}>{{node.name}}</option> - {{/each}} + {{/each}} + </optgroup> + <optgroup label="Other Nodes"> + {{#each currentNode.validOkToNodes as |node index|}} + <option value={{node.name}} selected={{eq node.name transition.okToNode.name}}>{{node.name}}</option> + {{/each}} + </optgroup> </select> {{#if showWarning}} <span class="ok-to-warning">
