简柏林 / thingskit · Commits

Commit 06ad8b79c299b306cd54681c2835cfa857d118ef

Authored by Vladyslav_Prykhodko
2 parents af63f82b 45a4c6f3

Merge remote-tracking branch 'upstream/master'

Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
... ... @@ -164,7 +164,12 @@ export default function EntityStateController($scope, $timeout, $location, $stat
164 164 var stateName = vm.states[vm.stateObject[index].id].name;
165 165 stateName = utils.customTranslation(stateName, stateName);
166 166 var params = vm.stateObject[index].params;
167   - var entityName = params && params.entityName ? params.entityName : '';
  167 + var entityName;
  168 + if (params && params.targetEntityParamName && params[params.targetEntityParamName].entityName) {
  169 + entityName = params[params.targetEntityParamName].entityName;
  170 + } else {
  171 + entityName = params && params.entityName ? params.entityName : '';
  172 + }
168 173 result = utils.insertVariable(stateName, 'entityName', entityName);
169 174 for (var prop in params) {
170 175 if (params[prop] && params[prop].entityName) {
... ...