Repository: nifi Updated Branches: refs/heads/master 2f928490e -> 0b95ccb90
NIFI-3380: - Fixing opening of Usage from the Controller Service and Reporting Task table. Signed-off-by: Scott Aslan <[email protected]> This closes #1684 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0b95ccb9 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0b95ccb9 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0b95ccb9 Branch: refs/heads/master Commit: 0b95ccb90a7ef10039ca9941e4297aa90b2a0615 Parents: 2f92849 Author: Matt Gilman <[email protected]> Authored: Thu Apr 20 16:04:22 2017 -0400 Committer: Scott Aslan <[email protected]> Committed: Fri Apr 21 09:48:24 2017 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-services.js | 7 +++++-- .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/0b95ccb9/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.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-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js index 427ef35..3c9726f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js @@ -1018,8 +1018,11 @@ $('#shell-close-button').click(); // open the documentation for this controller service - nfShell.showPage('../nifi-docs/documentation?' + $.param({ - select: nfCommon.substringAfterLast(controllerServiceEntity.component.type, '.') + nfShell.showPage('../nifi-docs/documentation?' + $.param({ + select: controllerServiceEntity.component.type, + group: controllerServiceEntity.component.bundle.group, + artifact: controllerServiceEntity.component.bundle.artifact, + version: controllerServiceEntity.component.bundle.version })).done(function() { if (nfCommon.isDefinedAndNotNull(controllerServiceEntity.component.parentGroupId)) { var groupId; http://git-wip-us.apache.org/repos/asf/nifi/blob/0b95ccb9/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index 667a675..2574cbd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -992,7 +992,10 @@ // open the documentation for this reporting task nfShell.showPage('../nifi-docs/documentation?' + $.param({ - select: nfCommon.substringAfterLast(reportingTaskEntity.component.type, '.') + select: reportingTaskEntity.component.type, + group: reportingTaskEntity.component.bundle.group, + artifact: reportingTaskEntity.component.bundle.artifact, + version: reportingTaskEntity.component.bundle.version })).done(function () { nfSettings.showSettings(); });
