简柏林 / thingskit · Commits

Commit f7f6a59163ed3ec5b4182767355dcf56c82cb900

Authored by Igor Kulikov
1 parent 5274de80

UI: Fix time based page link queries.

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
@@ -136,13 +136,13 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) { @@ -136,13 +136,13 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
136 var deferred = $q.defer(); 136 var deferred = $q.defer();
137 var url = '/api/alarm/' + entityType + '/' + entityId + '?limit=' + pageLink.limit; 137 var url = '/api/alarm/' + entityType + '/' + entityId + '?limit=' + pageLink.limit;
138 138
139 - if (angular.isDefined(pageLink.startTime)) { 139 + if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {
140 url += '&startTime=' + pageLink.startTime; 140 url += '&startTime=' + pageLink.startTime;
141 } 141 }
142 - if (angular.isDefined(pageLink.endTime)) { 142 + if (angular.isDefined(pageLink.endTime) && pageLink.endTime != null) {
143 url += '&endTime=' + pageLink.endTime; 143 url += '&endTime=' + pageLink.endTime;
144 } 144 }
145 - if (angular.isDefined(pageLink.idOffset)) { 145 + if (angular.isDefined(pageLink.idOffset) && pageLink.idOffset != null) {
146 url += '&offset=' + pageLink.idOffset; 146 url += '&offset=' + pageLink.idOffset;
147 } 147 }
148 if (alarmSearchStatus) { 148 if (alarmSearchStatus) {
@@ -30,13 +30,13 @@ function EventService($http, $q) { @@ -30,13 +30,13 @@ function EventService($http, $q) {
30 var deferred = $q.defer(); 30 var deferred = $q.defer();
31 var url = '/api/events/'+entityType+'/'+entityId+'/'+eventType+'?tenantId=' + tenantId + '&limit=' + pageLink.limit; 31 var url = '/api/events/'+entityType+'/'+entityId+'/'+eventType+'?tenantId=' + tenantId + '&limit=' + pageLink.limit;
32 32
33 - if (angular.isDefined(pageLink.startTime)) { 33 + if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {
34 url += '&startTime=' + pageLink.startTime; 34 url += '&startTime=' + pageLink.startTime;
35 } 35 }
36 - if (angular.isDefined(pageLink.endTime)) { 36 + if (angular.isDefined(pageLink.endTime) && pageLink.endTime != null) {
37 url += '&endTime=' + pageLink.endTime; 37 url += '&endTime=' + pageLink.endTime;
38 } 38 }
39 - if (angular.isDefined(pageLink.idOffset)) { 39 + if (angular.isDefined(pageLink.idOffset) && pageLink.idOffset != null) {
40 url += '&offset=' + pageLink.idOffset; 40 url += '&offset=' + pageLink.idOffset;
41 } 41 }
42 $http.get(url, null).then(function success(response) { 42 $http.get(url, null).then(function success(response) {