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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2019-12-26 12:01:09 +02:00
commit 06ad8b79c2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,12 @@ export default function EntityStateController($scope, $timeout, $location, $stat
var stateName = vm.states[vm.stateObject[index].id].name;
stateName = utils.customTranslation(stateName, stateName);
var params = vm.stateObject[index].params;
var entityName = params && params.entityName ? params.entityName : '';
var entityName;
if (params && params.targetEntityParamName && params[params.targetEntityParamName].entityName) {
entityName = params[params.targetEntityParamName].entityName;
} else {
entityName = params && params.entityName ? params.entityName : '';
}
result = utils.insertVariable(stateName, 'entityName', entityName);
for (var prop in params) {
if (params[prop] && params[prop].entityName) {