diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-21 19:51:30 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-21 19:51:30 -0400 |
| commit | 3d28695593da6fcb1a07fd8797e9202bc87aab67 (patch) | |
| tree | fce4ed68f75f5517afd6868232a62b1efbd3ba7b /www/js/DataModel.js | |
| parent | 63db9f5e8eeeb60af10183ee76dc1499a0d3fb6b (diff) | |
#265 - handled the case when multiserver API is null but its empty and there is no match
Former-commit-id: 73c453706318131614284a3cef29d27707c5b44a
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 10 |
1 files changed, 10 insertions, 0 deletions
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 @@ -1105,6 +1105,16 @@ angular.module('zmApp.controllers') } + 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); }) |