Browse Source

UI: Fix time based page link queries.

pull/295/merge
Igor Kulikov 9 years ago
parent
commit
f7f6a59163
  1. 6
      ui/src/app/api/alarm.service.js
  2. 6
      ui/src/app/api/event.service.js

6
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) {

6
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) {

Loading…
Cancel
Save