Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 be3254c94 -> 92df0d7cc
NIFI-250: - Reverting change to reload service and referencing components on done to do always. Since the enable/disable request may poll or be canceled by a user. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/92df0d7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/92df0d7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/92df0d7c Branch: refs/heads/NIFI-250 Commit: 92df0d7cc7074f4a14c571d1d69b2845b9a8ad7a Parents: be3254c Author: Matt Gilman <[email protected]> Authored: Fri Mar 27 09:39:27 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 27 09:39:27 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/92df0d7c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index 9371cfc..2bc83b6 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -1589,7 +1589,7 @@ nf.ControllerService = (function () { */ enable: function(controllerService) { if (nf.Common.isEmpty(controllerService.referencingComponents)) { - setEnabled(controllerService, true).done(function () { + setEnabled(controllerService, true).always(function () { reloadControllerServiceAndReferencingComponents(controllerService); }); } else { @@ -1604,7 +1604,7 @@ nf.ControllerService = (function () { */ disable: function(controllerService) { if (nf.Common.isEmpty(controllerService.referencingComponents)) { - setEnabled(controllerService, false).done(function () { + setEnabled(controllerService, false).always(function () { reloadControllerServiceAndReferencingComponents(controllerService); }); } else {
