Repository: nifi
Updated Branches:
  refs/heads/master 5ee83574d -> 24a77755d


NIFI-1548 Fixing Controller Service Usage Button. This closes #245

Signed-off-by: Matt Gilman <[email protected]>


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/24a77755
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/24a77755
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/24a77755

Branch: refs/heads/master
Commit: 24a77755de8d99467a883c964737eeceb886219e
Parents: 5ee8357
Author: James Wing <[email protected]>
Authored: Mon Feb 22 15:49:03 2016 -0800
Committer: Matt Gilman <[email protected]>
Committed: Mon Feb 22 21:09:01 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/24a77755/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();
+                     });
+                 }
             }
         });
 

Reply via email to