NIFI-250: - Specifying the correct UI extension type before populate the service/task DTO.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/10ebbf0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/10ebbf0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/10ebbf0c Branch: refs/heads/NIFI-250 Commit: 10ebbf0c3e9155e43dfbe866c42a27a021d3dc42 Parents: 07941b5 Author: Matt Gilman <[email protected]> Authored: Fri Mar 20 14:38:47 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 20 14:38:47 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/web/api/ControllerServiceResource.java | 2 +- .../main/java/org/apache/nifi/web/api/ReportingTaskResource.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/10ebbf0c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java index 8ca9a35..0885ba8 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ControllerServiceResource.java @@ -108,7 +108,7 @@ public class ControllerServiceResource extends ApplicationResource { if (uiExtensionMapping.hasUiExtension(controllerService.getType())) { final List<UiExtension> uiExtensions = uiExtensionMapping.getUiExtension(controllerService.getType()); for (final UiExtension uiExtension : uiExtensions) { - if (UiExtensionType.ProcessorConfiguration.equals(uiExtension.getExtensionType())) { + if (UiExtensionType.ControllerServiceConfiguration.equals(uiExtension.getExtensionType())) { controllerService.setCustomUiUrl(uiExtension.getContextPath() + "/configure"); } } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/10ebbf0c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java index b2c6293..d29f0ed 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ReportingTaskResource.java @@ -104,7 +104,7 @@ public class ReportingTaskResource extends ApplicationResource { if (uiExtensionMapping.hasUiExtension(reportingTask.getType())) { final List<UiExtension> uiExtensions = uiExtensionMapping.getUiExtension(reportingTask.getType()); for (final UiExtension uiExtension : uiExtensions) { - if (UiExtensionType.ProcessorConfiguration.equals(uiExtension.getExtensionType())) { + if (UiExtensionType.ReportingTaskConfiguration.equals(uiExtension.getExtensionType())) { reportingTask.setCustomUiUrl(uiExtension.getContextPath() + "/configure"); } }
