dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Help links improvements

Browse Source
This commit is contained in:
Igor Kulikov 2018-05-25 16:27:43 +03:00
parent 9a3df6285b
commit 0ea054c6ae
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/src/app/help/help-links.constant.js
View File

@ -99,19 +99,18 @@ export default angular.module('thingsboard.help', [])
widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static", widgetsConfigStatic: helpBaseUrl + "/docs/user-guide/ui/dashboards#static",
}, },
getRuleNodeLink: function(ruleNode) { getRuleNodeLink: function(ruleNode) {
var link = 'ruleEngine';
if (ruleNode && ruleNode.component) { if (ruleNode && ruleNode.component) {
if (ruleNode.component.configurationDescriptor && if (ruleNode.component.configurationDescriptor &&
ruleNode.component.configurationDescriptor.nodeDefinition && ruleNode.component.configurationDescriptor.nodeDefinition &&
ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) { ruleNode.component.configurationDescriptor.nodeDefinition.docUrl) {
link = ruleNode.component.configurationDescriptor.nodeDefinition.docUrl; return ruleNode.component.configurationDescriptor.nodeDefinition.docUrl;
} else if (ruleNode && ruleNode.component && ruleNode.component.clazz) { } else if (ruleNode.component.clazz) {
if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) { if (ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]) {
link = ruleNodeClazzHelpLinkMap[ruleNode.component.clazz]; return ruleNodeClazzHelpLinkMap[ruleNode.component.clazz];
} }
} }
} }
return link; return 'ruleEngine';
} }
} }
).name; ).name;

4
ui/src/app/help/help.directive.js
View File

@ -35,6 +35,10 @@ function Help($compile, $window, helpLinks) {
$event.stopPropagation(); $event.stopPropagation();
} }
var helpUrl = helpLinks.linksMap[scope.helpLinkId]; var helpUrl = helpLinks.linksMap[scope.helpLinkId];
if (!helpUrl && scope.helpLinkId &&
(scope.helpLinkId.startsWith('http://') || scope.helpLinkId.startsWith('https://'))) {
helpUrl = scope.helpLinkId;
}
if (helpUrl) { if (helpUrl) {
$window.open(helpUrl, '_blank'); $window.open(helpUrl, '_blank');
} }