Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 d8a27993d -> e8294f29e
NIFI-250: - Reopening the settings to the controller services/reporting tasks table after showing usage or custom UIs. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e8294f29 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e8294f29 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e8294f29 Branch: refs/heads/NIFI-250 Commit: e8294f29e2f5aef8cec0117cd09a2242b5ef2ca9 Parents: d8a2799 Author: Matt Gilman <[email protected]> Authored: Tue Mar 24 15:31:40 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 24 15:31:40 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 7 ++++++- .../src/main/webapp/js/nf/canvas/nf-reporting-task.js | 7 ++++++- .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 8 ++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e8294f29/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 e5956bc..ddf9c50 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 @@ -1356,6 +1356,9 @@ nf.ControllerService = (function () { nf.CustomUi.showCustomUi($('#controller-service-id').text(), controllerService.customUiUrl, true).done(function () { // once the custom ui is closed, reload the controller service reloadControllerService(controllerService); + + // show the settings + nf.Settings.showSettings(); }); }; @@ -1505,7 +1508,9 @@ nf.ControllerService = (function () { controllerServiceDialog.modal('hide'); // show the custom ui - nf.CustomUi.showCustomUi(controllerService.id, controllerService.customUiUrl, false); + nf.CustomUi.showCustomUi(controllerService.id, controllerService.customUiUrl, false).done(function () { + nf.Settings.showSettings(); + }); } } }); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e8294f29/nifi/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/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index 66d7b09..22cbd5d 100644 --- a/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -469,6 +469,9 @@ nf.ReportingTask = (function () { nf.CustomUi.showCustomUi($('#reporting-task-id').text(), reportingTask.customUiUrl, true).done(function () { // once the custom ui is closed, reload the reporting task reloadReportingTask(reportingTask); + + // show the settings + nf.Settings.showSettings(); }); }; @@ -616,7 +619,9 @@ nf.ReportingTask = (function () { reportingTaskDialog.modal('hide'); // show the custom ui - nf.CustomUi.showCustomUi(reportingTask.id, reportingTask.customUiUrl, false); + nf.CustomUi.showCustomUi(reportingTask.id, reportingTask.customUiUrl, false).done(function() { + nf.Settings.showSettings(); + }); } } }); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e8294f29/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.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-settings.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index ce68296..b14b38a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -866,7 +866,9 @@ nf.Settings = (function () { // open the documentation for this reporting task nf.Shell.showPage('../nifi-docs/documentation?' + $.param({ select: nf.Common.substringAfterLast(controllerService.type, '.') - })); + })).done(function() { + nf.Settings.showSettings(); + }); } } else if (controllerServicesGrid.getColumns()[args.cell].id === 'moreDetails') { if (target.hasClass('view-controller-service')) { @@ -1457,7 +1459,9 @@ nf.Settings = (function () { // open the documentation for this reporting task nf.Shell.showPage('../nifi-docs/documentation?' + $.param({ select: nf.Common.substringAfterLast(reportingTask.type, '.') - })); + })).done(function() { + nf.Settings.showSettings(); + }); } } else if (reportingTasksGrid.getColumns()[args.cell].id === 'moreDetails') { if (target.hasClass('view-reporting-task')) {
