Repository: nifi Updated Branches: refs/heads/master 4d88aaedc -> 8392b4659
NIFI-1397: - Only resetting the node availability when closing the new controller service or reporting task dialog. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8392b465 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8392b465 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8392b465 Branch: refs/heads/master Commit: 8392b46597eee715c1ca20d96a5e6e447b60dfab Parents: 4d88aae Author: Matt Gilman <[email protected]> Authored: Fri Jan 15 13:33:20 2016 -0500 Committer: Aldrin Piri <[email protected]> Committed: Fri Jan 22 13:20:58 2016 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-settings.js | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8392b465/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index f6ff3ea..ee75e5c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -171,12 +171,6 @@ nf.Settings = (function () { * Hides the selected controller service. */ var clearSelectedControllerService = function () { - if (nf.Canvas.isClustered()) { - $('#controller-service-availability-combo').combo('setSelectedOption', { - value: config.node - }); - } - $('#controller-service-type-description').text(''); $('#controller-service-type-name').text(''); $('#selected-controller-service-name').text(''); @@ -517,6 +511,13 @@ nf.Settings = (function () { }], handler: { close: function () { + // reset the node availability + if (nf.Canvas.isClustered()) { + $('#controller-service-availability-combo').combo('setSelectedOption', { + value: config.node + }); + } + // clear the selected row clearSelectedControllerService(); @@ -921,12 +922,6 @@ nf.Settings = (function () { * Hides the selected reporting task. */ var clearSelectedReportingTask = function () { - if (nf.Canvas.isClustered()) { - $('#reporting-task-availability-combo').combo('setSelectedOption', { - value: config.node - }); - } - $('#reporting-task-type-description').text(''); $('#reporting-task-type-name').text(''); $('#selected-reporting-task-name').text(''); @@ -1215,6 +1210,13 @@ nf.Settings = (function () { }], handler: { close: function () { + // reset the node availability + if (nf.Canvas.isClustered()) { + $('#reporting-task-availability-combo').combo('setSelectedOption', { + value: config.node + }); + } + // clear the selected row clearSelectedReportingTask();
