From 0ea054c6ae2fbd34b701fb79a33b86982fcdb12d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Fri, 25 May 2018 16:27:43 +0300 Subject: [PATCH] Help links improvements --- ui/src/app/help/help-links.constant.js | 9 ++++----- ui/src/app/help/help.directive.js | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/src/app/help/help-links.constant.js b/ui/src/app/help/help-links.constant.js index 7e77c22849..8d22eeb124 100644 --- a/ui/src/app/help/help-links.constant.js +++ b/ui/src/app/help/help-links.constant.js @@ -99,19 +99,18 @@ export default angular.module('thingsboard.help', []) widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static", }, getRuleNodeLink: function(ruleNode) { - var link = 'ruleEngine'; if (ruleNode && ruleNode.component) { if (ruleNode.component.configurationDescriptor && ruleNode.component.configurationDescriptor.nodeDefinition && ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) { - link = ruleNode.component.configurationDescriptor.nodeDefinition.docUrl; - } else if (ruleNode && ruleNode.component && ruleNode.component.clazz) { + return ruleNode.component.configurationDescriptor.nodeDefinition.docUrl; + } else if (ruleNode.component.clazz) { if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) { - link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; + return ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; } } } - return link; + return 'ruleEngine'; } } ).name; diff --git a/ui/src/app/help/help.directive.js b/ui/src/app/help/help.directive.js index bc7e84f9e2..9227d4443e 100644 --- a/ui/src/app/help/help.directive.js +++ b/ui/src/app/help/help.directive.js @@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) { $event.stopPropagation(); } var helpUrl = helpLinks.linksMap[scope.helpLinkId]; + if (!helpUrl && scope.helpLinkId && + (scope.helpLinkId.startsWith('http://') || scope.helpLinkId.startsWith('https://'))) { + helpUrl = scope.helpLinkId; + } if (helpUrl) { $window.open(helpUrl, '_blank'); }