Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 5c98ccdbf -> e0e2d161b
NIFI-250: - Closing the controller service and reporting task shell whenever a custom UI is opened. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/07941b52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/07941b52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/07941b52 Branch: refs/heads/NIFI-250 Commit: 07941b5209fa182b02ac7e2d66ebade0416c4319 Parents: 5c98ccd Author: Matt Gilman <[email protected]> Authored: Fri Mar 20 14:38:09 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 20 14:38:09 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-service.js | 5 ++++- .../src/main/webapp/js/nf/canvas/nf-reporting-task.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/07941b52/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 b21cf06..701eb17 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 @@ -1329,7 +1329,10 @@ nf.ControllerService = (function () { var openCustomUi = function () { // reset state and close the dialog manually to avoid hiding the faded background controllerServiceDialog.modal('hide'); - + + // close the settings dialog since the custom ui is also opened in the shell + $('#shell-close-button').click(); + // show the custom ui nf.CustomProcessorUi.showCustomUi($('#controller-service-id').text(), controllerService.customUiUrl, true).done(function () { // once the custom ui is closed, reload the controller service http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/07941b52/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 04ffaa8..f07e730 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 @@ -435,6 +435,9 @@ nf.ReportingTask = (function () { // reset state and close the dialog manually to avoid hiding the faded background $('#reporting-task-configuration').modal('hide'); + // close the settings dialog since the custom ui is also opened in the shell + $('#shell-close-button').click(); + // show the custom ui nf.CustomProcessorUi.showCustomUi($('#reporting-task-id').text(), reportingTask.customUiUrl, true).done(function () { // once the custom ui is closed, reload the reporting task
