From d324a89f3825b6b6085993fe1d290051a78b1414 Mon Sep 17 00:00:00 2001
From: Mirco Pizzichini <52463156+mircopz@users.noreply.github.com>
Date: Fri, 19 Jul 2019 12:31:30 +0200
Subject: [PATCH] Now variable  is resolved also when setting a target entity
 parameter name (#1856)

---
 ui/src/app/components/widget/widget.controller.js      | 1 +
 ui/src/app/dashboard/states/entity-state-controller.js | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ui/src/app/components/widget/widget.controller.js b/ui/src/app/components/widget/widget.controller.js
index fce4b69d58..996e808a39 100644
--- a/ui/src/app/components/widget/widget.controller.js
+++ b/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;
diff --git a/ui/src/app/dashboard/states/entity-state-controller.js b/ui/src/app/dashboard/states/entity-state-controller.js
index 762b19552c..550f46ed55 100644
--- a/ui/src/app/dashboard/states/entity-state-controller.js
+++ b/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);