Repository: nifi Updated Branches: refs/heads/master 1c9ea249f -> 2f928490e
[NIFI-3360] inject nf.ControllerServices into nf.ControllerService. This closes #1685 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2f928490 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2f928490 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2f928490 Branch: refs/heads/master Commit: 2f928490e3c787aba21b7fbe0c8614a17aef1454 Parents: 1c9ea24 Author: Scott Aslan <[email protected]> Authored: Thu Apr 20 16:52:28 2017 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Apr 21 08:24:14 2017 -0400 ---------------------------------------------------------------------- .../main/webapp/js/nf/canvas/nf-canvas-bootstrap.js | 2 +- .../webapp/js/nf/canvas/nf-controller-service.js | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2f928490/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js index f0ea29e..b6ec75f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js @@ -356,7 +356,7 @@ // initialize the connection config and invert control of the birdseye and graph nfConnectionConfiguration.init(nfBirdseye, nfGraph); - nfControllerService.init(); + nfControllerService.init(nfControllerServices); nfReportingTask.init(nfSettings); nfPolicyManagement.init(); nfProcessorConfiguration.init(); http://git-wip-us.apache.org/repos/asf/nifi/blob/2f928490/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js index 5acd3ca..0274e46 100644 --- a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js @@ -25,15 +25,14 @@ 'nf.Common', 'nf.Dialog', 'nf.Client', - 'nf.ControllerServices', 'nf.Settings', 'nf.UniversalCapture', 'nf.CustomUi', 'nf.CanvasUtils', 'nf.ReportingTask', 'nf.Processor'], - function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { - return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor)); + function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { + return (nf.ControllerService = factory($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor)); }); } else if (typeof exports === 'object' && typeof module === 'object') { module.exports = (nf.ControllerService = @@ -43,7 +42,6 @@ require('nf.Common'), require('nf.Dialog'), require('nf.Client'), - require('nf.ControllerServices'), require('nf.Settings'), require('nf.UniversalCapture'), require('nf.CustomUi'), @@ -57,7 +55,6 @@ root.nf.Common, root.nf.Dialog, root.nf.Client, - root.nf.ControllerServices, root.nf.Settings, root.nf.UniversalCapture, root.nf.CustomUi, @@ -65,9 +62,11 @@ root.nf.ReportingTask, root.nf.Processor); } -}(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfControllerServices, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { +}(this, function ($, d3, nfErrorHandler, nfCommon, nfDialog, nfClient, nfSettings, nfUniversalCapture, nfCustomUi, nfCanvasUtils, nfReportingTask, nfProcessor) { 'use strict'; + var nfControllerServices; + var config = { edit: 'edit', readOnly: 'read-only', @@ -1625,7 +1624,9 @@ /** * Initializes the controller service configuration dialog. */ - init: function () { + init: function (nfControllerServicesRef) { + nfControllerServices = nfControllerServicesRef; + // initialize the configuration dialog tabs $('#controller-service-configuration-tabs').tabbs({ tabStyle: 'tab', @@ -1795,7 +1796,6 @@ descriptorDeferred: getControllerServicePropertyDescriptor, controllerServiceCreatedDeferred: function (response) { var controllerServicesUri; - var createdControllerServicesTable; // calculate the correct uri var createdControllerService = response.component;
