From f7f6a59163ed3ec5b4182767355dcf56c82cb900 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Thu, 21 Sep 2017 09:55:50 +0300
Subject: [PATCH] UI: Fix time based page link queries.

---
 ui/src/app/api/alarm.service.js | 6 +++---
 ui/src/app/api/event.service.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/src/app/api/alarm.service.js b/ui/src/app/api/alarm.service.js
index d23ede3a06..6c614917c9 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) {
diff --git a/ui/src/app/api/event.service.js b/ui/src/app/api/event.service.js
index 688e91dd5e..4ba174f6c8 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) {