diff options
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/LoginCtrl.js | 8 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index 34c29eec..c8be575b 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -288,9 +288,11 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } // strip cgi-bin if it is there but only at the end - if ($scope.loginData.streamingurl.slice(-7).toLowerCase() == 'cgi-bin') { + // Nov 17 Don't mess with this path. centos uses zm-cgi-bin of all things + + /*if ($scope.loginData.streamingurl.slice(-7).toLowerCase() == 'cgi-bin') { $scope.loginData.streamingurl = $scope.loginData.streamingurl.slice(0, -7); - } + }*/ // check for protocol and if not put it in @@ -378,7 +380,7 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r ZMDataModel.getPathZms() .then(function (data) { var ld = ZMDataModel.getLogin(); - ZMDataModel.zmLog("PATH_ZMS:" + data + " ,Path ZmNinja will use:" + ld.streamingurl + "/cgi-bin/nph-zms"); + ZMDataModel.zmLog("PATH_ZMS:" + data + ", Path ZmNinja will use:" + ld.streamingurl + "/nph-zms"); ZMDataModel.zmLog("If live streams are not working, make sure you check these values"); diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 7f264f4d..5a3ef4f9 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -40,6 +40,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var hiddenOrder = []; // 1 = hide, 0 = don't hide var tempMonitors = message; + console.log ("TEMP MONITORS IS " + JSON.stringify(tempMonitors)); var tempResponse = ZMDataModel.applyMontageMonitorPrefs(message, 0); $scope.monitors = tempResponse[0]; montageOrder = tempResponse[1]; @@ -152,7 +153,10 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' var ld = ZMDataModel.getLogin(); - ZMDataModel.getAuthKey() + + console.log ("MONITORS " + JSON.stringify($scope.monitors)); + $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id; + ZMDataModel.getAuthKey($rootScope.validMonitorId) .then(function (success) { $ionicLoading.hide(); console.log(success); |