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

Merge pull request #13 from BohdanSmetanyuk/bug/undefined_rule_chain_type_ui

Browse Source 
fixed bug with undefined rule chain type
This commit is contained in:
VoBa 2020-06-23 18:55:42 +03:00 committed by GitHub
commit 2a1deb2bc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/rulechain/rulechain.controller.js
View File

@ -1180,7 +1180,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
var saveRuleChainPromise;
if (vm.isImport) {
if (angular.isUndefined(vm.ruleChain.type)) {
vm.ruleChain.type = types.systemRuleChainType;
vm.ruleChain.type = types.coreRuleChainType;
}
saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain);
} else {
@ -1269,7 +1269,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
vm.isDirty = false;
vm.isImport = false;
$mdUtil.nextTick(() => {
if (vm.ruleChain.type === vm.types.systemRuleChainType) {
if (vm.ruleChain.type === vm.types.coreRuleChainType) {
$state.go('home.ruleChains.core.ruleChain', {ruleChainId: vm.ruleChain.id.id});
} else {
$state.go('home.ruleChains.edge.ruleChain', {ruleChainId: vm.ruleChain.id.id});
@ -1293,7 +1293,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration);
var ruleChainId = vm.ruleChain.id ? vm.ruleChain.id.id : null;
var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.systemRuleChainType;
var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.coreRuleChainType;
vm.enableHotKeys = false;

2
ui/src/app/rulechain/rulechain.routes.js
View File

@ -82,7 +82,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
ruleNodeComponents:
/*@ngInject*/
function($stateParams, ruleChainService) {
return ruleChainService.getRuleNodeComponents(types.systemRuleChainType);
return ruleChainService.getRuleNodeComponents(types.coreRuleChainType);
}
},
data: {

8
ui/src/app/rulechain/rulechains.controller.js
View File

@ -114,7 +114,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
if (vm.ruleChainsScope === 'tenant') {
fetchRuleChainsFunction = function (pageLink) {
return fetchRuleChains(pageLink, types.systemRuleChainType);
return fetchRuleChains(pageLink, types.coreRuleChainType);
};
deleteRuleChainFunction = function (ruleChainId) {
return deleteRuleChain(ruleChainId);
@ -162,9 +162,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
});
vm.ruleChainGridConfig.addItemActions.push({
onAction: function ($event) {
importExport.importRuleChain($event, types.systemRuleChainType).then(
importExport.importRuleChain($event, types.coreRuleChainType).then(
function(ruleChainImport) {
$state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.systemRuleChainType});
$state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.coreRuleChainType});
}
);
},
@ -385,7 +385,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
if (vm.ruleChainsScope === 'edges') {
ruleChain.type = types.edgeRuleChainType;
} else {
ruleChain.type = types.systemRuleChainType;
ruleChain.type = types.coreRuleChainType;
}
}
return ruleChainService.saveRuleChain(ruleChain);