Showing
2 changed files
with
21 additions
and
13 deletions
| @@ -439,7 +439,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | @@ -439,7 +439,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | ||
| 439 | return entityId; | 439 | return entityId; |
| 440 | } | 440 | } |
| 441 | 441 | ||
| 442 | - function getStateEntityId(filter, stateParams) { | 442 | + function getStateEntityInfo(filter, stateParams) { |
| 443 | var entityId = null; | 443 | var entityId = null; |
| 444 | if (stateParams) { | 444 | if (stateParams) { |
| 445 | if (filter.stateEntityParamName && filter.stateEntityParamName.length) { | 445 | if (filter.stateEntityParamName && filter.stateEntityParamName.length) { |
| @@ -456,7 +456,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | @@ -456,7 +456,9 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | ||
| 456 | if (entityId) { | 456 | if (entityId) { |
| 457 | entityId = resolveAliasEntityId(entityId.entityType, entityId.id); | 457 | entityId = resolveAliasEntityId(entityId.entityType, entityId.id); |
| 458 | } | 458 | } |
| 459 | - return entityId; | 459 | + return { |
| 460 | + entityId: entityId | ||
| 461 | + }; | ||
| 460 | } | 462 | } |
| 461 | 463 | ||
| 462 | function resolveAliasFilter(filter, stateParams, maxItems, failOnEmpty) { | 464 | function resolveAliasFilter(filter, stateParams, maxItems, failOnEmpty) { |
| @@ -468,7 +470,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | @@ -468,7 +470,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | ||
| 468 | if (filter.stateEntityParamName && filter.stateEntityParamName.length) { | 470 | if (filter.stateEntityParamName && filter.stateEntityParamName.length) { |
| 469 | result.entityParamName = filter.stateEntityParamName; | 471 | result.entityParamName = filter.stateEntityParamName; |
| 470 | } | 472 | } |
| 471 | - var stateEntityId = getStateEntityId(filter, stateParams); | 473 | + var stateEntityInfo = getStateEntityInfo(filter, stateParams); |
| 474 | + var stateEntityId = stateEntityInfo.entityId; | ||
| 472 | switch (filter.type) { | 475 | switch (filter.type) { |
| 473 | case types.aliasFilterType.singleEntity.value: | 476 | case types.aliasFilterType.singleEntity.value: |
| 474 | var aliasEntityId = resolveAliasEntityId(filter.singleEntity.entityType, filter.singleEntity.id); | 477 | var aliasEntityId = resolveAliasEntityId(filter.singleEntity.entityType, filter.singleEntity.id); |
| @@ -850,7 +853,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | @@ -850,7 +853,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device | ||
| 850 | 853 | ||
| 851 | function getEntityFieldKeys (entityType, searchText) { | 854 | function getEntityFieldKeys (entityType, searchText) { |
| 852 | let entityFieldKeys = []; | 855 | let entityFieldKeys = []; |
| 853 | - let query = searchText.toLowerCase(); | 856 | + let query = searchText ? searchText.toLowerCase() : ""; |
| 854 | switch(entityType) { | 857 | switch(entityType) { |
| 855 | case types.entityType.user: | 858 | case types.entityType.user: |
| 856 | entityFieldKeys.push(types.entityField.name.keyName); | 859 | entityFieldKeys.push(types.entityField.name.keyName); |
| @@ -44,8 +44,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat | @@ -44,8 +44,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat | ||
| 44 | function openState(id, params, openRightLayout) { | 44 | function openState(id, params, openRightLayout) { |
| 45 | if (vm.states && vm.states[id]) { | 45 | if (vm.states && vm.states[id]) { |
| 46 | resolveEntity(params).then( | 46 | resolveEntity(params).then( |
| 47 | - function success(entityName) { | ||
| 48 | - params.entityName = entityName; | 47 | + function success() { |
| 49 | var newState = { | 48 | var newState = { |
| 50 | id: id, | 49 | id: id, |
| 51 | params: params | 50 | params: params |
| @@ -66,8 +65,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat | @@ -66,8 +65,7 @@ export default function EntityStateController($scope, $timeout, $location, $stat | ||
| 66 | } | 65 | } |
| 67 | if (vm.states && vm.states[id]) { | 66 | if (vm.states && vm.states[id]) { |
| 68 | resolveEntity(params).then( | 67 | resolveEntity(params).then( |
| 69 | - function success(entityName) { | ||
| 70 | - params.entityName = entityName; | 68 | + function success() { |
| 71 | var newState = { | 69 | var newState = { |
| 72 | id: id, | 70 | id: id, |
| 73 | params: params | 71 | params: params |
| @@ -183,16 +181,16 @@ export default function EntityStateController($scope, $timeout, $location, $stat | @@ -183,16 +181,16 @@ export default function EntityStateController($scope, $timeout, $location, $stat | ||
| 183 | params = params[params.targetEntityParamName]; | 181 | params = params[params.targetEntityParamName]; |
| 184 | } | 182 | } |
| 185 | if (params && params.entityId && params.entityId.id && params.entityId.entityType) { | 183 | if (params && params.entityId && params.entityId.id && params.entityId.entityType) { |
| 186 | - if (params.entityName && params.entityName.length) { | ||
| 187 | - deferred.resolve(params.entityName); | 184 | + if (isEntityResolved(params)) { |
| 185 | + deferred.resolve(); | ||
| 188 | } else { | 186 | } else { |
| 189 | entityService.getEntity(params.entityId.entityType, params.entityId.id, { | 187 | entityService.getEntity(params.entityId.entityType, params.entityId.id, { |
| 190 | ignoreLoading: true, | 188 | ignoreLoading: true, |
| 191 | ignoreErrors: true | 189 | ignoreErrors: true |
| 192 | }).then( | 190 | }).then( |
| 193 | function success(entity) { | 191 | function success(entity) { |
| 194 | - var entityName = entity.name; | ||
| 195 | - deferred.resolve(entityName); | 192 | + params.entityName = entity.name; |
| 193 | + deferred.resolve(); | ||
| 196 | }, | 194 | }, |
| 197 | function fail() { | 195 | function fail() { |
| 198 | deferred.reject(); | 196 | deferred.reject(); |
| @@ -200,11 +198,18 @@ export default function EntityStateController($scope, $timeout, $location, $stat | @@ -200,11 +198,18 @@ export default function EntityStateController($scope, $timeout, $location, $stat | ||
| 200 | ); | 198 | ); |
| 201 | } | 199 | } |
| 202 | } else { | 200 | } else { |
| 203 | - deferred.resolve(''); | 201 | + deferred.resolve(); |
| 204 | } | 202 | } |
| 205 | return deferred.promise; | 203 | return deferred.promise; |
| 206 | } | 204 | } |
| 207 | 205 | ||
| 206 | + function isEntityResolved(params) { | ||
| 207 | + if (!params.entityName || !params.entityName.length) { | ||
| 208 | + return false; | ||
| 209 | + } | ||
| 210 | + return true; | ||
| 211 | + } | ||
| 212 | + | ||
| 208 | function parseState(stateBase64) { | 213 | function parseState(stateBase64) { |
| 209 | var result; | 214 | var result; |
| 210 | if (stateBase64) { | 215 | if (stateBase64) { |