简柏林 / thingskit · Commits

Commit bee4da8995ea87f28170781df7bc7ba530375cf6

Authored by Artem Babak
1 parent 8082930a

Edge Downlinks refactored

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -35,7 +35,7 @@ function EdgeService($http, $q, customerService) { @@ -35,7 +35,7 @@ function EdgeService($http, $q, customerService) {
35 unassignEdgeFromCustomer: unassignEdgeFromCustomer, 35 unassignEdgeFromCustomer: unassignEdgeFromCustomer,
36 makeEdgePublic: makeEdgePublic, 36 makeEdgePublic: makeEdgePublic,
37 setRootRuleChain: setRootRuleChain, 37 setRootRuleChain: setRootRuleChain,
38 - getEdgeDownlinks: getEdgeDownlinks, 38 + getEdgeEvents: getEdgeEvents,
39 syncEdge: syncEdge, 39 syncEdge: syncEdge,
40 findMissingToRelatedRuleChains: findMissingToRelatedRuleChains 40 findMissingToRelatedRuleChains: findMissingToRelatedRuleChains
41 }; 41 };
@@ -276,7 +276,7 @@ function EdgeService($http, $q, customerService) { @@ -276,7 +276,7 @@ function EdgeService($http, $q, customerService) {
276 return deferred.promise; 276 return deferred.promise;
277 } 277 }
278 278
279 - function getEdgeDownlinks(edgeId, pageLink) { 279 + function getEdgeEvents(edgeId, pageLink) {
280 var deferred = $q.defer(); 280 var deferred = $q.defer();
281 var url = '/api/edge/' + edgeId + '/events' + '?limit=' + pageLink.limit; 281 var url = '/api/edge/' + edgeId + '/events' + '?limit=' + pageLink.limit;
282 if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) { 282 if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {
@@ -67,7 +67,7 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc @@ -67,7 +67,7 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc
67 if (scope.entityType && scope.entityId && scope.tenantId) { 67 if (scope.entityType && scope.entityId && scope.tenantId) {
68 scope.loadEdgeInfo(); 68 scope.loadEdgeInfo();
69 scope.downlinks.pending = true; 69 scope.downlinks.pending = true;
70 - edgeService.getEdgeDownlinks(scope.entityId, scope.downlinks.nextPageLink).then( 70 + edgeService.getEdgeEvents(scope.entityId, scope.downlinks.nextPageLink).then(
71 function success(downlinks) { 71 function success(downlinks) {
72 scope.downlinks.data = scope.downlinks.data.concat(prepareEdgeDownlinksData(downlinks.data)); 72 scope.downlinks.data = scope.downlinks.data.concat(prepareEdgeDownlinksData(downlinks.data));
73 scope.downlinks.nextPageLink = downlinks.nextPageLink; 73 scope.downlinks.nextPageLink = downlinks.nextPageLink;