summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorArjun Roychowdhury <pliablepixels@gmail.com>2015-09-28 10:00:17 -0400
committerArjun Roychowdhury <pliablepixels@gmail.com>2015-09-28 10:00:17 -0400
commita769608def65e613267f85b7fce4a46fdb8ed53b (patch)
tree69128d994286a4916015dc3e6428140d82a6d6de /www/js
parente3dc85379b51e3e6c9bd359531f1231241906cdd (diff)
remove ZM restart as monitor patch applied to ZM to restart zmx
Diffstat (limited to 'www/js')
-rw-r--r--www/js/MonitorCtrl.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 5c5a05e8..8df03ef0 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -93,7 +93,7 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
var apiRestart = loginData.apiurl + "/states/change/restart.json";
var apiMon = loginData.apiurl + "/monitors/" + monitorId + ".json";
- ZMDataModel.zmDebug("MonitorCtrl: URLs for changeConfig save:" + apiRestart + ">>" + apiMon);
+ ZMDataModel.zmDebug("MonitorCtrl: URLs for changeConfig save:" + apiMon);
var isEnabled = "";
isEnabled = ($scope.monfunc.myenabled == true) ? '1' : '0';
@@ -125,7 +125,8 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
// I am restarting ZM after monitor change
// do I need this? FIXME: Ask Kyle
.success(function () {
- ZMDataModel.zmDebug ("MonitorCtrl: Restarting ZM");
+ ZMDataModel.zmDebug ("MonitorCtrl: Not restarting ZM - Make sure you have the patch installed in MonitorsController.php or this won't work");
+ /* ZMDataModel.zmDebug ("MonitorCtrl: Restarting ZM");
$ionicLoading.show({
template: "Successfully changed Monitor. Please wait, restarting ZoneMinder...",
noBackdrop: true,
@@ -145,7 +146,7 @@ angular.module('zmApp.controllers').controller('zmApp.MonitorCtrl', ['$ionicPopu
$ionicLoading.hide();
}
- );
+ );*/
})
.error(function (data, status, headers, config) {