Repository: incubator-nifi Updated Branches: refs/heads/develop 64502d0e1 -> cef720679
NIFI-699: - Removing the enabled checkbox from the controller service configuration dialog. This was originally added to be consistent with the processor configuration dialog. However, the action may be long running and needs a polling mechanism to indicate to the user once the action completes. This is currently built into the enable/disable dialog and that is the preferred mechanism for enabling/disabling. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cef72067 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cef72067 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cef72067 Branch: refs/heads/develop Commit: cef720679686c48327b919ff2eeb192659e4f287 Parents: 64502d0 Author: Matt Gilman <[email protected]> Authored: Fri Jun 19 08:51:22 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Jun 19 08:51:22 2015 -0400 ---------------------------------------------------------------------- .../canvas/controller-service-configuration.jsp | 4 ---- .../src/main/webapp/css/controller-service.css | 13 ------------- .../js/nf/canvas/nf-controller-service.js | 20 -------------------- 3 files changed, 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cef72067/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp index 533aa54..7a0f992 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp @@ -25,10 +25,6 @@ <div class="setting-name">Name</div> <div class="controller-service-editable setting-field"> <input type="text" id="controller-service-name" name="controller-service-name" class="setting-input"/> - <div class="controller-service-enabled-container"> - <div id="controller-service-enabled" class="nf-checkbox checkbox-unchecked"></div> - <span> Enabled</span> - </div> </div> <div class="controller-service-read-only setting-field hidden"> <span id="read-only-controller-service-name"></span> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cef72067/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css index acc8487..3d722cd 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css @@ -79,19 +79,6 @@ div.controller-service-configuration-tab-container { float: left; } -#controller-service-enabled { - width: 12px; - height: 12px; - float: left; - margin-right: 4px; -} - -div.controller-service-enabled-container { - float: left; - margin-top: 5px; - margin-left: 10px; -} - div.availability-setting { float: left; width: 140px; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cef72067/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 9f2f22f..e8a111d 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 @@ -70,12 +70,6 @@ nf.ControllerService = (function () { return true; } - if ($('#controller-service-enabled').hasClass('checkbox-checked') && details['state'] === 'DISABLED') { - return true; - } else if ($('#controller-service-enabled').hasClass('checkbox-unchecked') && details['state'] === 'ENABLED') { - return true; - } - // defer to the properties return $('#controller-service-properties').propertytable('isSaveRequired'); }; @@ -98,13 +92,6 @@ nf.ControllerService = (function () { controllerServiceDto['properties'] = properties; } - // mark the controller service enabled if appropriate - if ($('#controller-service-enabled').hasClass('checkbox-unchecked')) { - controllerServiceDto['state'] = 'DISABLED'; - } else if ($('#controller-service-enabled').hasClass('checkbox-checked')) { - controllerServiceDto['state'] = 'ENABLED'; - } - // create the controller service entity var controllerServiceEntity = {}; controllerServiceEntity['revision'] = nf.Client.getRevision(); @@ -1438,17 +1425,10 @@ nf.ControllerService = (function () { // record the controller service details controllerServiceDialog.data('controllerServiceDetails', controllerService); - // determine if the enabled checkbox is checked or not - var controllerServiceEnableStyle = 'checkbox-checked'; - if (controllerService['state'] === 'DISABLED') { - controllerServiceEnableStyle = 'checkbox-unchecked'; - } - // populate the controller service settings nf.Common.populateField('controller-service-id', controllerService['id']); nf.Common.populateField('controller-service-type', nf.Common.substringAfterLast(controllerService['type'], '.')); $('#controller-service-name').val(controllerService['name']); - $('#controller-service-enabled').removeClass('checkbox-checked checkbox-unchecked').addClass(controllerServiceEnableStyle); $('#controller-service-comments').val(controllerService['comments']); // select the availability when appropriate
