diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-06-02 15:16:24 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-06-02 15:16:24 -0400 |
| commit | 29b13a5332eeb3e7003d834b21fa65a4948f18b2 (patch) | |
| tree | 682b79bda35b09afaf33fe2bf5a1bd38cbc9d5b5 | |
| parent | 03b59d7240fee7eae220dfb8ef2d81d396489b0a (diff) | |
removed zms from PATH_ZMS in wizard
Former-commit-id: 20ea1cb9e43fec13926762d7c427a7ca651b8529
| -rw-r--r-- | www/js/WizardCtrl.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js index ec0cd383..10bffde9 100644 --- a/www/js/WizardCtrl.js +++ b/www/js/WizardCtrl.js @@ -197,8 +197,12 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ ZMDataModel.getPathZms() // what does ZM have stored in PATH_ZMS? .then (function(data){ - urls.push (baseUri.trim()+data.trim()); - ZMDataModel.zmLog ("zmWizard: getPathZMS succeeded, adding "+baseUri+data.trim()+" to things to try"); + // remove zms or nph-zms + var path = data.trim(); + path = path.replace("/nph-zms",""); + path = path.replace("/zms",""); + urls.push (baseUri.trim()+path); + ZMDataModel.zmLog ("zmWizard: getPathZMS succeeded, adding "+baseUri+path+" to things to try"); continueCgi(urls); }, function (error) { @@ -370,7 +374,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ view: "login" } }) - .then (function (success) {console.log ("ZMlogout success"); d.resolve(true); return d.promise;}, function (error) {console.log ("ZMlogout success");d.resolve(true); return d.promise;}); + .then (function (success) {$rootScope.zmCookie="";console.log ("ZMlogout success, cookie removed"); d.resolve(true); return d.promise;}, function (error) {console.log ("ZMlogout success");d.resolve(true); return d.promise;}); return d.promise; |