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

Fix entity name resolution (#2317)

Browse Source
This commit is contained in:
Vladyslav 2020-01-08 12:53:03 +02:00 committed by Igor Kulikov
parent 850d6d948c
commit d1cfe65661
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/dashboard/states/entity-state-controller.js
View File

@ -164,11 +164,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat
let stateName = vm.states[vm.stateObject[index].id].name;
stateName = utils.customTranslation(stateName, stateName);
var params = vm.stateObject[index].params;
let targetParams = params && params.targetEntityParamName ? params[params.targetEntityParamName] : params;
let entityName, entityLabel;
entityName =targetParams.entityName ? targetParams.entityName : '';
entityLabel = targetParams.entityLabel ? targetParams.entityLabel : entityName;
let entityName = params && params.entityName ? params.entityName : '';
let entityLabel = params && params.entityLabel ? params.entityLabel : entityName;
result = utils.insertVariable(stateName, 'entityName', entityName);
result = utils.insertVariable(result, 'entityLabel', entityLabel);