From 3d28695593da6fcb1a07fd8797e9202bc87aab67 Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Sat, 21 May 2016 19:51:30 -0400 Subject: #265 - handled the case when multiserver API is null but its empty and there is no match Former-commit-id: 73c453706318131614284a3cef29d27707c5b44a --- www/js/DataModel.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'www/js') diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 233df399..7001dcef 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -1104,6 +1104,16 @@ angular.module('zmApp.controllers') //zmDebug ("Base URL for Monitor " + monitors[i].Monitor.Id + " is " + monitors[i].Monitor.baseURL ); + } + else + { + monitors[i].Monitor.listDisplay='show'; + monitors[i].Monitor.isAlarmed = false; + monitors[i].Monitor.connKey = (Math.floor((Math.random() * 999999) + 1)).toString(); + monitors[i].Monitor.streamingURL = loginData.streamingurl; + monitors[i].Monitor.baseURL = loginData.url; + monitors[i].Monitor.imageMode = (versionCompare($rootScope.apiVersion,"1.30")==-1) ? "path":"fid"; + zmDebug ("API " +$rootScope.apiVersion+ ": Monitor " + monitors[i].Monitor.Id + " will use " + monitors[i].Monitor.imageMode + " for direct image access" ); } } d.resolve(monitors); -- cgit v1.2.3