Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1397: - Only resetting the node availability when closing the new controller service or reporting task dialog. 

Signed-off-by: Aldrin Piri <aldrin@apache.org>
This commit is contained in:
Matt Gilman 2016-01-15 13:33:20 -05:00 committed by Aldrin Piri
parent 4d88aaedc5
commit 8392b46597
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
View File

@ -171,12 +171,6 @@ nf.Settings = (function () {
* Hides the selected controller service. * Hides the selected controller service.
*/ */
var clearSelectedControllerService = function () { var clearSelectedControllerService = function () {
if (nf.Canvas.isClustered()) {
$('#controller-service-availability-combo').combo('setSelectedOption', {
value: config.node
});
}
$('#controller-service-type-description').text(''); $('#controller-service-type-description').text('');
$('#controller-service-type-name').text(''); $('#controller-service-type-name').text('');
$('#selected-controller-service-name').text(''); $('#selected-controller-service-name').text('');
@ -517,6 +511,13 @@ nf.Settings = (function () {
}], }],
handler: { handler: {
close: function () { close: function () {
// reset the node availability
if (nf.Canvas.isClustered()) {
$('#controller-service-availability-combo').combo('setSelectedOption', {
value: config.node
});
}
// clear the selected row // clear the selected row
clearSelectedControllerService(); clearSelectedControllerService();
@ -921,12 +922,6 @@ nf.Settings = (function () {
* Hides the selected reporting task. * Hides the selected reporting task.
*/ */
var clearSelectedReportingTask = function () { var clearSelectedReportingTask = function () {
if (nf.Canvas.isClustered()) {
$('#reporting-task-availability-combo').combo('setSelectedOption', {
value: config.node
});
}
$('#reporting-task-type-description').text(''); $('#reporting-task-type-description').text('');
$('#reporting-task-type-name').text(''); $('#reporting-task-type-name').text('');
$('#selected-reporting-task-name').text(''); $('#selected-reporting-task-name').text('');
@ -1215,6 +1210,13 @@ nf.Settings = (function () {
}], }],
handler: { handler: {
close: function () { close: function () {
// reset the node availability
if (nf.Canvas.isClustered()) {
$('#reporting-task-availability-combo').combo('setSelectedOption', {
value: config.node
});
}
// clear the selected row // clear the selected row
clearSelectedReportingTask(); clearSelectedReportingTask();