Browse Source

Now variable is resolved also when setting a target entity parameter name (#1856)

pull/1876/head
Mirco Pizzichini 7 years ago
committed by Igor Kulikov
parent
commit
d324a89f38
  1. 1
      ui/src/app/components/widget/widget.controller.js
  2. 3
      ui/src/app/dashboard/states/entity-state-controller.js

1
ui/src/app/components/widget/widget.controller.js

@ -455,6 +455,7 @@ export default function WidgetController($scope, $state, $timeout, $window, $ele
if (!targetEntityParams) {
targetEntityParams = {};
params[targetEntityParamName] = targetEntityParams;
params.targetEntityParamName = targetEntityParamName;
}
} else {
targetEntityParams = params;

3
ui/src/app/dashboard/states/entity-state-controller.js

@ -179,6 +179,9 @@ export default function EntityStateController($scope, $timeout, $location, $stat
function resolveEntity(params) {
var deferred = $q.defer();
if (params && params.targetEntityParamName) {
params = params[params.targetEntityParamName];
}
if (params && params.entityId && params.entityId.id && params.entityId.entityType) {
if (params.entityName && params.entityName.length) {
deferred.resolve(params.entityName);

Loading…
Cancel
Save