Repository: nifi Updated Branches: refs/heads/master 7bc255b9b -> 2ceb5c809
NIFI-2647: - Referencing correct components when checking if save is required. This closes #935. Signed-off-by: Andy LoPresto <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2ceb5c80 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2ceb5c80 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2ceb5c80 Branch: refs/heads/master Commit: 2ceb5c80971de86710e884703ef5999df603512d Parents: 7bc255b Author: Matt Gilman <[email protected]> Authored: Wed Aug 24 16:56:25 2016 -0400 Committer: Andy LoPresto <[email protected]> Committed: Wed Aug 24 15:52:20 2016 -0700 ---------------------------------------------------------------------- .../main/webapp/js/nf/canvas/nf-controller-service.js | 6 +++--- .../src/main/webapp/js/nf/canvas/nf-reporting-task.js | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2ceb5c80/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 bc9b157..cccadcd 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 @@ -58,14 +58,14 @@ nf.ControllerService = (function () { * that needs to be saved. */ var isSaveRequired = function () { - var details = $('#controller-service-configuration').data('controllerServiceDetails'); + var entity = $('#controller-service-configuration').data('controllerServiceDetails'); // determine if any controller service settings have changed - if ($('#controller-service-name').val() !== details['name']) { + if ($('#controller-service-name').val() !== entity.component['name']) { return true; } - if ($('#controller-service-comments').val() !== details['comments']) { + if ($('#controller-service-comments').val() !== entity.component['comments']) { return true; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2ceb5c80/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index 7a2540d..b3a8745 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -65,25 +65,25 @@ nf.ReportingTask = (function () { * that needs to be saved. */ var isSaveRequired = function () { - var details = $('#reporting-task-configuration').data('reportingTaskDetails'); + var entity = $('#reporting-task-configuration').data('reportingTaskDetails'); // determine if any reporting task settings have changed - if ($('#reporting-task-name').val() !== details.name) { + if ($('#reporting-task-name').val() !== entity.component['name']) { return true; } - if ($('#reporting-task-comments').val() !== details['comments']) { + if ($('#reporting-task-comments').val() !== entity.component['comments']) { return true; } - if ($('#reporting-task-enabled').hasClass('checkbox-checked') && details['state'] === 'DISABLED') { + if ($('#reporting-task-enabled').hasClass('checkbox-checked') && entity.component['state'] === 'DISABLED') { return true; - } else if ($('#reporting-task-enabled').hasClass('checkbox-unchecked') && (details['state'] === 'RUNNING' || details['state'] === 'STOPPED')) { + } else if ($('#reporting-task-enabled').hasClass('checkbox-unchecked') && (entity.component['state'] === 'RUNNING' || entity.component['state'] === 'STOPPED')) { return true; } // consider the scheduling strategy var schedulingStrategy = $('#reporting-task-scheduling-strategy-combo').combo('getSelectedOption').value; - if (schedulingStrategy !== (details['schedulingStrategy'] + '')) { + if (schedulingStrategy !== (entity.component['schedulingStrategy'] + '')) { return true; } @@ -96,7 +96,7 @@ nf.ReportingTask = (function () { } // check the scheduling period - if (nf.Common.isDefinedAndNotNull(schedulingPeriod) && schedulingPeriod.val() !== (details['schedulingPeriod'] + '')) { + if (nf.Common.isDefinedAndNotNull(schedulingPeriod) && schedulingPeriod.val() !== (entity.component['schedulingPeriod'] + '')) { return true; }
