tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

UI: Minor fixes

pull/196/head
Igor Kulikov 9 years ago
parent
4b67d428d7
commit
8e272b0162
2 changed files with 36 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      ui/src/app/api/entity.service.js
  2. 2
      ui/src/app/entity/relation/relation-table.tpl.html

51
ui/src/app/api/entity.service.js
View File

@ -892,10 +892,10 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
} }
} }
function getRelatedEntities(rootEntityId, entityType, entitySubTypes, maxLevel, keys, typeTranslatePrefix) { function getRelatedEntities(rootEntityId, entityType, entitySubTypes, maxLevel, keys, typeTranslatePrefix, relationType) {
var deferred = $q.defer(); var deferred = $q.defer();
var entitySearchQuery = constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel); var entitySearchQuery = constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType);
if (!entitySearchQuery) { if (!entitySearchQuery) {
deferred.reject(); deferred.reject();
} else { } else {
@ -930,12 +930,12 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
return deferred.promise; return deferred.promise;
} }
function saveRelatedEntity(relatedEntity, parentEntityId, keys) { function saveRelatedEntity(relatedEntity, parentEntityId, keys, relation) {
var deferred = $q.defer(); var deferred = $q.defer();
if (relatedEntity.id.id) { if (relatedEntity.id.id) {
updateRelatedEntity(relatedEntity, keys, deferred); updateRelatedEntity(relatedEntity, keys, deferred, relation);
} else { } else {
addRelatedEntity(relatedEntity, parentEntityId, keys, deferred); addRelatedEntity(relatedEntity, parentEntityId, keys, deferred, relation);
} }
return deferred.promise; return deferred.promise;
} }
@ -1073,7 +1073,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
} }
} }
function addRelatedEntity(relatedEntity, parentEntityId, keys, deferred) { function addRelatedEntity(relatedEntity, parentEntityId, keys, deferred, relation) {
var entity = {}; var entity = {};
entity.id = relatedEntity.id; entity.id = relatedEntity.id;
entity.name = relatedEntity.name; entity.name = relatedEntity.name;
@ -1081,14 +1081,18 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
saveEntityPromise(entity).then( saveEntityPromise(entity).then(
function success(entity) { function success(entity) {
relatedEntity.id = entity.id; relatedEntity.id = entity.id;
var relation = { if (!relation) {
from: parentEntityId, relation = {
to: relatedEntity.id, from: parentEntityId,
type: types.entityRelationType.contains to: relatedEntity.id,
}; type: types.entityRelationType.contains
};
} else {
relation.to = relatedEntity.id;
}
entityRelationService.saveRelation(relation).then( entityRelationService.saveRelation(relation).then(
function success() { function success() {
updateEntity(entity, relatedEntity, keys, deferred); updateEntity(entity, relatedEntity, keys, deferred, relation);
}, },
function fail() { function fail() {
deferred.reject(); deferred.reject();
@ -1101,10 +1105,22 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
); );
} }
function updateRelatedEntity(relatedEntity, keys, deferred) { function updateRelatedEntity(relatedEntity, keys, deferred, relation) {
getEntityPromise(relatedEntity.id.entityType, relatedEntity.id.id, {ignoreLoading: true}).then( getEntityPromise(relatedEntity.id.entityType, relatedEntity.id.id, {ignoreLoading: true}).then(
function success(entity) { function success(entity) {
updateEntity(entity, relatedEntity, keys, deferred); if (relation) {
relation.to = relatedEntity.id;
entityRelationService.saveRelation(relation).then(
function success() {
updateEntity(entity, relatedEntity, keys, deferred);
},
function fail() {
deferred.reject();
}
);
} else {
updateEntity(entity, relatedEntity, keys, deferred);
}
}, },
function fail() { function fail() {
deferred.reject(); deferred.reject();
@ -1146,7 +1162,7 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
); );
} }
function constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel) { function constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType) {
var searchQuery = { var searchQuery = {
parameters: { parameters: {
@ -1154,8 +1170,11 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
rootType: rootEntityId.entityType, rootType: rootEntityId.entityType,
direction: types.entitySearchDirection.from direction: types.entitySearchDirection.from
}, },
relationType: types.entityRelationType.contains relationType: relationType
}; };
if (!relationType) {
searchQuery.relationType = types.entityRelationType.contains;
}
if (maxLevel) { if (maxLevel) {
searchQuery.parameters.maxLevel = maxLevel; searchQuery.parameters.maxLevel = maxLevel;

2
ui/src/app/entity/relation/relation-table.tpl.html
View File

@ -125,7 +125,7 @@
</md-table-container> </md-table-container>
<md-table-pagination md-limit="vm.query.limit" md-limit-options="[5, 10, 15]" <md-table-pagination md-limit="vm.query.limit" md-limit-options="[5, 10, 15]"
md-page="vm.query.page" md-total="{{vm.relationsCount}}" md-page="vm.query.page" md-total="{{vm.relationsCount}}"
md-on-paginate="onPaginate" md-page-select> md-on-paginate="vm.onPaginate" md-page-select>
</md-table-pagination> </md-table-pagination>
</div> </div>
</md-content> </md-content>

Write Preview
Loading…
Cancel
Save