Commit 2726c7184ae76accc0c2d9b12bfc4abc74e8cdf6
1 parent
e6787c0b
UI: Subscription - improve entity resolving procedure.
Showing
1 changed file
with
21 additions
and
11 deletions
| @@ -824,17 +824,27 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | @@ -824,17 +824,27 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | ||
| 824 | var subscriptionInfo = validateSubscriptionInfo(subscriptionsInfo[index]); | 824 | var subscriptionInfo = validateSubscriptionInfo(subscriptionsInfo[index]); |
| 825 | if (subscriptionInfo.type === types.datasourceType.entity) { | 825 | if (subscriptionInfo.type === types.datasourceType.entity) { |
| 826 | if (subscriptionInfo.entityId) { | 826 | if (subscriptionInfo.entityId) { |
| 827 | - getEntity(subscriptionInfo.entityType, subscriptionInfo.entityId, {ignoreLoading: true}).then( | ||
| 828 | - function success(entity) { | ||
| 829 | - createDatasourceFromSubscription(subscriptionInfo, datasources, entity); | ||
| 830 | - index++; | ||
| 831 | - processSubscriptionsInfo(index, subscriptionsInfo, datasources, deferred); | ||
| 832 | - }, | ||
| 833 | - function fail() { | ||
| 834 | - index++; | ||
| 835 | - processSubscriptionsInfo(index, subscriptionsInfo, datasources, deferred); | ||
| 836 | - } | ||
| 837 | - ); | 827 | + if (subscriptionInfo.entityName) { |
| 828 | + var entity = { | ||
| 829 | + id: {id: subscriptionInfo.entityId, entityType: subscriptionInfo.entityType}, | ||
| 830 | + name: subscriptionInfo.entityName | ||
| 831 | + }; | ||
| 832 | + createDatasourceFromSubscription(subscriptionInfo, datasources, entity); | ||
| 833 | + index++; | ||
| 834 | + processSubscriptionsInfo(index, subscriptionsInfo, datasources, deferred); | ||
| 835 | + } else { | ||
| 836 | + getEntity(subscriptionInfo.entityType, subscriptionInfo.entityId, {ignoreLoading: true}).then( | ||
| 837 | + function success(entity) { | ||
| 838 | + createDatasourceFromSubscription(subscriptionInfo, datasources, entity); | ||
| 839 | + index++; | ||
| 840 | + processSubscriptionsInfo(index, subscriptionsInfo, datasources, deferred); | ||
| 841 | + }, | ||
| 842 | + function fail() { | ||
| 843 | + index++; | ||
| 844 | + processSubscriptionsInfo(index, subscriptionsInfo, datasources, deferred); | ||
| 845 | + } | ||
| 846 | + ); | ||
| 847 | + } | ||
| 838 | } else if (subscriptionInfo.entityName || subscriptionInfo.entityNamePrefix | 848 | } else if (subscriptionInfo.entityName || subscriptionInfo.entityNamePrefix |
| 839 | || subscriptionInfo.entityIds) { | 849 | || subscriptionInfo.entityIds) { |
| 840 | var promise; | 850 | var promise; |