#1067 make sure we don't get stuck in a loop between ZM groups and mo…

…ntage profiles
ZoneMinder · May 26, 2021 · deb2e03 · deb2e03
1 parent 09ffc96
commit deb2e03
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
@@ -1004,9 +1004,21 @@ angular.module('zmApp.controllers')
 
     $scope.selectZMGroup = function() {
 
+
       $scope.tempZMGroups = [];
       var ld = NVR.getLogin();
 
+
+      if (ld.currentMontageProfile != $translate.instant('kMontageDefaultProfile') && ld.currentMontageProfile) {
+        $rootScope.zmPopup = $ionicPopup.alert({
+          title: $translate.instant('kError'),
+          template: $translate.instant('kErrorZMGroupMontageProfile') + $translate.instant('kMontageDefaultProfile'),
+
+        });
+        return;
+      }
+
+
       for (var i=0; i < $scope.zmGroups.length; i++) {
        var val = ld.currentZMGroupNames.includes($scope.zmGroups[i])? true:false;
        $scope.tempZMGroups.push ({
@@ -1975,11 +1987,20 @@ angular.module('zmApp.controllers')
     }
     // switch to another montage profile
     $scope.switchMontageProfile = function () {
-
-
-
       var posArray;
       var i;
+      var ld = NVR.getLogin();
+
+      if ($scope.currentZMGroupName && 
+          (ld.currentMontageProfile != $translate.instant('kMontageDefaultProfile') ||
+           ld.currentMontageProfile)) {
+            NVR.debug ('Resetting currentZMGroupName - this is hopefully a one time thing');
+            $scope.currentZMGroupName='';
+            ld.currentZMGroupName='';
+            ld.currentZMGroupNames = [];
+            NVR.setLogin(ld);
+           }  
+
 
       if ($scope.currentZMGroupName) {
         $rootScope.zmPopup = $ionicPopup.alert({

diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
@@ -98,7 +98,8 @@
     "kErrorRetrievingFrames"     :"error retrieving frames",
     "kErrorRetrievingState"      :"error retrieving state",
     "kErrorSave"                 :"Error - could not save",
-    "kErrorMontageProfileZMGroup":"Montage profiles cannot be switched with a ZM group is active",
+    "kErrorMontageProfileZMGroup":"Montage profiles cannot be switched when a ZM group is active",
+    "kErrorZMGroupMontageProfile":"ZM groups cannot be switched when a Montage Profile is active. Please switch to: ",
     "kEvent"                     :"event",
     "kEventDeleteConfirm"        :"Are you sure you want to delete Event:",
     "kEventHistHrs"              :"hours ago",