diff options
| author | Pliable Pixels <pliablepixels@users.noreply.github.com> | 2019-05-28 16:12:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 16:12:18 -0400 |
| commit | 572d19af26f07d78b99f8e2a0603a57ca066b326 (patch) | |
| tree | 0628ef7a8467cd1124245cf28a59ed5bfda3ad17 /www/js/MomentCtrl.js | |
| parent | adb63ae77e1318a1c42dd0fe8ce31cfa7584194b (diff) | |
| parent | 5bf531cfd5aa6812dd96bb3aa887187f71f3f560 (diff) | |
Merge pull request #819 from pliablepixels/api-tokens
Api tokens
Diffstat (limited to 'www/js/MomentCtrl.js')
| -rw-r--r-- | www/js/MomentCtrl.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/js/MomentCtrl.js b/www/js/MomentCtrl.js index b749837a..79454c33 100644 --- a/www/js/MomentCtrl.js +++ b/www/js/MomentCtrl.js @@ -324,7 +324,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ var ld = NVR.getLogin(); ld.montageReviewCollapse = $scope.expand; - console.log(">>>>>>>>> SAVING EXPAND AS:" + $scope.expand); + // console.log(">>>>>>>>> SAVING EXPAND AS:" + $scope.expand); NVR.setLogin(ld); }; @@ -749,7 +749,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ var ld = NVR.getLogin(); // in API, always sort by StartTime so all monitors are represented - var myurl = ld.apiurl + "/events/index/AlarmFrames >=:1" + excludeMonitorsFilter + "/StartTime >=:" + timeFrom + "/StartTime <=:" + timeTo + ".json?sort=" + "StartTime" + "&direction=desc"; + var myurl = ld.apiurl + "/events/index/AlarmFrames >=:1" + excludeMonitorsFilter + "/StartTime >=:" + timeFrom + "/StartTime <=:" + timeTo + ".json?sort=" + "StartTime" + "&direction=desc"+$rootScope.authSession; NVR.debug("Retrieving " + myurl); @@ -848,7 +848,7 @@ angular.module('zmApp.controllers').controller('zmApp.MomentCtrl', ['$scope', '$ $scope.expand = ld.montageReviewCollapse; - console.log(">>>>>>>>> RESTORING EXPAND AS:" + $scope.expand); + //console.log(">>>>>>>>> RESTORING EXPAND AS:" + $scope.expand); $scope.loadingStatus = $translate.instant('kLoading'); |