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

fixed bug with undefined rule chain type

Browse Source
This commit is contained in:
Bohdan Smetaniuk 2020-06-22 18:26:00 +03:00
parent de11d1ce3d
commit 1f57524851
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; var saveRuleChainPromise;
if (vm.isImport) { if (vm.isImport) {
if (angular.isUndefined(vm.ruleChain.type)) { if (angular.isUndefined(vm.ruleChain.type)) {
vm.ruleChain.type = types.systemRuleChainType; vm.ruleChain.type = types.coreRuleChainType;
} }
saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain); saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain);
} else { } else {
@ -1269,7 +1269,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
vm.isDirty = false; vm.isDirty = false;
vm.isImport = false; vm.isImport = false;
$mdUtil.nextTick(() => { $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}); $state.go('home.ruleChains.core.ruleChain', {ruleChainId: vm.ruleChain.id.id});
} else { } else {
$state.go('home.ruleChains.edge.ruleChain', {ruleChainId: vm.ruleChain.id.id}); $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); ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration);
var ruleChainId = vm.ruleChain.id ? vm.ruleChain.id.id : null; 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; vm.enableHotKeys = false;

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

@ -82,7 +82,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
ruleNodeComponents: ruleNodeComponents:
/*@ngInject*/ /*@ngInject*/
function($stateParams, ruleChainService) { function($stateParams, ruleChainService) {
return ruleChainService.getRuleNodeComponents(types.systemRuleChainType); return ruleChainService.getRuleNodeComponents(types.coreRuleChainType);
} }
}, },
data: { 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') { if (vm.ruleChainsScope === 'tenant') {
fetchRuleChainsFunction = function (pageLink) { fetchRuleChainsFunction = function (pageLink) {
return fetchRuleChains(pageLink, types.systemRuleChainType); return fetchRuleChains(pageLink, types.coreRuleChainType);
}; };
deleteRuleChainFunction = function (ruleChainId) { deleteRuleChainFunction = function (ruleChainId) {
return deleteRuleChain(ruleChainId); return deleteRuleChain(ruleChainId);
@ -162,9 +162,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
}); });
vm.ruleChainGridConfig.addItemActions.push({ vm.ruleChainGridConfig.addItemActions.push({
onAction: function ($event) { onAction: function ($event) {
importExport.importRuleChain($event, types.systemRuleChainType).then( importExport.importRuleChain($event, types.coreRuleChainType).then(
function(ruleChainImport) { 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') { if (vm.ruleChainsScope === 'edges') {
ruleChain.type = types.edgeRuleChainType; ruleChain.type = types.edgeRuleChainType;
} else { } else {
ruleChain.type = types.systemRuleChainType; ruleChain.type = types.coreRuleChainType;
} }
} }
return ruleChainService.saveRuleChain(ruleChain); return ruleChainService.saveRuleChain(ruleChain);