thingsboard-memoizeit

UI: Fix time based page link queries.

9/21/2017 3:55:50 AM

Igor Kulikov

Commit: f7f6a59

Tree: 1e201d5

Parents: 5274de8

Changes

ui/src/app/api/alarm.service.js 6(+3 -3)

ui/src/app/api/event.service.js 6(+3 -3)

Details

ui/src/app/api/alarm.service.js 6(+3 -3)

diff --git a/ui/src/app/api/alarm.service.js b/ui/src/app/api/alarm.service.js
index d23ede3..6c61491 100644
--- a/ui/src/app/api/alarm.service.js
+++ b/ui/src/app/api/alarm.service.js
@@ -136,13 +136,13 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
         var deferred = $q.defer();
         var url = '/api/alarm/' + entityType + '/' + entityId + '?limit=' + pageLink.limit;
 
-        if (angular.isDefined(pageLink.startTime)) {
+        if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {
             url += '&startTime=' + pageLink.startTime;
         }
-        if (angular.isDefined(pageLink.endTime)) {
+        if (angular.isDefined(pageLink.endTime) && pageLink.endTime != null) {
             url += '&endTime=' + pageLink.endTime;
         }
-        if (angular.isDefined(pageLink.idOffset)) {
+        if (angular.isDefined(pageLink.idOffset) && pageLink.idOffset != null) {
             url += '&offset=' + pageLink.idOffset;
         }
         if (alarmSearchStatus) {

ui/src/app/api/event.service.js 6(+3 -3)

diff --git a/ui/src/app/api/event.service.js b/ui/src/app/api/event.service.js
index 688e91d..4ba174f 100644
--- a/ui/src/app/api/event.service.js
+++ b/ui/src/app/api/event.service.js
@@ -30,13 +30,13 @@ function EventService($http, $q) {
         var deferred = $q.defer();
         var url = '/api/events/'+entityType+'/'+entityId+'/'+eventType+'?tenantId=' + tenantId + '&limit=' + pageLink.limit;
 
-        if (angular.isDefined(pageLink.startTime)) {
+        if (angular.isDefined(pageLink.startTime) && pageLink.startTime != null) {
             url += '&startTime=' + pageLink.startTime;
         }
-        if (angular.isDefined(pageLink.endTime)) {
+        if (angular.isDefined(pageLink.endTime) && pageLink.endTime != null) {
             url += '&endTime=' + pageLink.endTime;
         }
-        if (angular.isDefined(pageLink.idOffset)) {
+        if (angular.isDefined(pageLink.idOffset) && pageLink.idOffset != null) {
             url += '&offset=' + pageLink.idOffset;
         }
         $http.get(url, null).then(function success(response) {