Commit d324a89f3825b6b6085993fe1d290051a78b1414
Committed by
Igor Kulikov
Igor Kulikov
1 parent
4e71935d
Now variable is resolved also when setting a target entity parameter name (#1856)
Showing
2 changed files
with
4 additions
and
0 deletions
| @@ -455,6 +455,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele | @@ -455,6 +455,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele | ||
| 455 | if (!targetEntityParams) { | 455 | if (!targetEntityParams) { |
| 456 | targetEntityParams = {}; | 456 | targetEntityParams = {}; |
| 457 | params[targetEntityParamName] = targetEntityParams; | 457 | params[targetEntityParamName] = targetEntityParams; |
| 458 | + params.targetEntityParamName = targetEntityParamName; | ||
| 458 | } | 459 | } |
| 459 | } else { | 460 | } else { |
| 460 | targetEntityParams = params; | 461 | targetEntityParams = params; |
| @@ -179,6 +179,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat | @@ -179,6 +179,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat | ||
| 179 | 179 | ||
| 180 | function resolveEntity(params) { | 180 | function resolveEntity(params) { |
| 181 | var deferred = $q.defer(); | 181 | var deferred = $q.defer(); |
| 182 | + if (params && params.targetEntityParamName) { | ||
| 183 | + params = params[params.targetEntityParamName]; | ||
| 184 | + } | ||
| 182 | if (params && params.entityId && params.entityId.id && params.entityId.entityType) { | 185 | if (params && params.entityId && params.entityId.id && params.entityId.entityType) { |
| 183 | if (params.entityName && params.entityName.length) { | 186 | if (params.entityName && params.entityName.length) { |
| 184 | deferred.resolve(params.entityName); | 187 | deferred.resolve(params.entityName); |