简柏林 / thingskit · Commits

Commit d1cfe6566192e1fcce18cd4080e09af8c0157044

Authored by Vladyslav
Committed by Igor Kulikov
1 parent 850d6d94

Fix entity name resolution (#2317)

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -164,11 +164,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat @@ -164,11 +164,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat
164 let stateName = vm.states[vm.stateObject[index].id].name; 164 let stateName = vm.states[vm.stateObject[index].id].name;
165 stateName = utils.customTranslation(stateName, stateName); 165 stateName = utils.customTranslation(stateName, stateName);
166 var params = vm.stateObject[index].params; 166 var params = vm.stateObject[index].params;
167 - let targetParams = params && params.targetEntityParamName ? params[params.targetEntityParamName] : params;  
168 167
169 - let entityName, entityLabel;  
170 - entityName =targetParams.entityName ? targetParams.entityName : '';  
171 - entityLabel = targetParams.entityLabel ? targetParams.entityLabel : entityName; 168 + let entityName = params && params.entityName ? params.entityName : '';
  169 + let entityLabel = params && params.entityLabel ? params.entityLabel : entityName;
172 170
173 result = utils.insertVariable(stateName, 'entityName', entityName); 171 result = utils.insertVariable(stateName, 'entityName', entityName);
174 result = utils.insertVariable(result, 'entityLabel', entityLabel); 172 result = utils.insertVariable(result, 'entityLabel', entityLabel);