#1067 don't allow profile switching of montage when a ZM group is active

ZoneMinder · May 25, 2021 · 09ffc96 · 09ffc96
1 parent 4713bb6
commit 09ffc96
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
@@ -1075,17 +1075,20 @@ angular.module('zmApp.controllers')
                     }
 
                     $scope.MontageMonitors[iz].Monitor.listDisplay = isShow? 'show':'noshow';
+                    NVR.debug ('Group:'+$scope.currentZMGroupName+' setting '+$scope.MontageMonitors[iz].Monitor.Name +' to '+ $scope.MontageMonitors[iz].Monitor.listDisplay);
+
                      // console.log ('----> Setting '+ $scope.MontageMonitors[i].Monitor.Name+' to '+ $scope.MontageMonitors[i].Monitor.listDisplay);
 
 
                 }
-
+                $scope.monitors = $scope.MontageMonitors;
+                NVR.setMonitors($scope.MontageMonitors);
                 ld.packeryPositions = undefined;
                 NVR.setLogin(ld)
                 .then (function() {
                   var ps = NVR.getLogin().packeryPositions;
-                  var p = parsePositions(ps);
-                  matchMonitorsToPositions(p);
+                  //var p = parsePositions(ps);
+                  //matchMonitorsToPositions(p);
                   initPackery().then (function () {
                     NVR.debug ("initPackery over, storing positions");
                     var positions = pckry.getShiftPositions('data-item-id');
@@ -1972,9 +1975,21 @@ angular.module('zmApp.controllers')
     }
     // switch to another montage profile
     $scope.switchMontageProfile = function () {
+
+
+
       var posArray;
       var i;
 
+      if ($scope.currentZMGroupName) {
+        $rootScope.zmPopup = $ionicPopup.alert({
+          title: $translate.instant('kError'),
+          template: $translate.instant('kErrorMontageProfileZMGroup'),
+
+        });
+        return;
+      }
+
       try {
         posArray = NVR.getLogin().packeryPositionsArray;
         //console.log ("PA="+JSON.stringify(posArray));
@@ -2351,8 +2366,9 @@ angular.module('zmApp.controllers')
 
         } 
       } // pos
-      if (!monitor_found) {
-        mon[m].Monitor.listDisplay = (ld.currentMontageProfile == $translate.instant('kMontageDefaultProfile')) ?'show':'noshow';
+      if (!monitor_found && !$scope.currentZMGroupName) {
+        NVR.debug (mon[m].Monitor.Name+' not found, profile='+ld.currentMontageProfile+' and group='+$scope.currentZMGroupName);
+        mon[m].Monitor.listDisplay = ((ld.currentMontageProfile == $translate.instant('kMontageDefaultProfile') || !ld.currentMontageProfile || !positions.length)) ?'show':'noshow';
         NVR.debug (ld.currentMontageProfile + '=> Making '+mon[m].Monitor.Name+' to '+mon[m].Monitor.listDisplay+' as this monitor was not found in profile');
 
       }

diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json
@@ -98,6 +98,7 @@
     "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",
     "kEvent"                     :"event",
     "kEventDeleteConfirm"        :"Are you sure you want to delete Event:",
     "kEventHistHrs"              :"hours ago",