You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/02/23 03:08:41 UTC
nifi git commit: NIFI-1548 Fixing Controller Service Usage Button.
This closes #245
Repository: nifi
Updated Branches:
refs/heads/support/nifi-0.5.x f56e1551e -> 280714942
NIFI-1548 Fixing Controller Service Usage Button. This closes #245
Signed-off-by: Matt Gilman <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/28071494
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/28071494
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/28071494
Branch: refs/heads/support/nifi-0.5.x
Commit: 280714942097b0703a1f8f92913d95159cd89bfa
Parents: f56e155
Author: James Wing <jv...@gmail.com>
Authored: Mon Feb 22 15:49:03 2016 -0800
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 22 21:07:14 2016 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-settings.js | 24 ++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/28071494/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 67bf385..64b1c50 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
@@ -767,7 +767,17 @@ nf.Settings = (function () {
} else if (controllerServicesGrid.getColumns()[args.cell].id === 'moreDetails') {
if (target.hasClass('view-controller-service')) {
nf.ControllerService.showDetails(controllerService);
- }
+ } else if (target.hasClass('controller-service-usage')) {
+ // close the settings dialog
+ $('#shell-close-button').click();
+
+ // open the documentation for this controller service
+ nf.Shell.showPage('../nifi-docs/documentation?' + $.param({
+ select: nf.Common.substringAfterLast(controllerService.type, '.')
+ })).done(function() {
+ nf.Settings.showSettings();
+ });
+ }
}
});
@@ -1413,7 +1423,17 @@ nf.Settings = (function () {
} else if (reportingTasksGrid.getColumns()[args.cell].id === 'moreDetails') {
if (target.hasClass('view-reporting-task')) {
nf.ReportingTask.showDetails(reportingTask);
- }
+ } else if (target.hasClass('reporting-task-usage')) {
+ // close the settings dialog
+ $('#shell-close-button').click();
+
+ // 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();
+ });
+ }
}
});