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

NIFI-694: 

- Fixing bug when clearing bulletins from the reporting task table.
- Allowed ENABLING state to trigger transition to next step of the enable/disable request.
This commit is contained in:
Matt Gilman 2015-07-01 14:25:12 -04:00
parent e7c0461b15
commit 4fd1e9494e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
View File

@ -591,9 +591,9 @@ nf.ControllerService = (function () {
}
}
// the condition is met once the service is ENABLED/DISABLED
// the condition is met once the service is (ENABLING or ENABLED)/DISABLED
if (enabled) {
return service.state === 'ENABLED';
return service.state === 'ENABLING' || service.state === 'ENABLED';
} else {
return service.state === 'DISABLED';
}
@ -828,7 +828,7 @@ nf.ControllerService = (function () {
var notEnabled = false;
$.each(referencingComponents, function(_, referencingComponent) {
if (referencingComponent.referenceType === 'ControllerService') {
if (referencingComponent.state !== 'ENABLED') {
if (referencingComponent.state !== 'ENABLING' && referencingComponent.state !== 'ENABLED') {
notEnabled = true;
}

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

@ -1741,7 +1741,7 @@ nf.Settings = (function () {
// if there are no bulletins clear all
var reportingTasks = reportingTasksData.getItems();
$.each(reportingTasks, function(_, reportingTask) {
controllerServicesData.updateItem(reportingTask.id, $.extend(reportingTask, {
reportingTasksData.updateItem(reportingTask.id, $.extend(reportingTask, {
bulletins: []
}));
});