Updated system mangement snapshot && snapshot dialog

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3804 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/systems/class_SnapShotDialog.inc b/plugins/admin/systems/class_SnapShotDialog.inc
index 213bde0aeffd1d8eb738ab59dbb707cf311d2e56..dcac0b80c72558c5aa059f1d8aa1d538c80d4f0d 100755 (executable)
--- a/plugins/admin/systems/class_SnapShotDialog.inc
+++ b/plugins/admin/systems/class_SnapShotDialog.inc
@@ -31,7 +31,14 @@ class SnapShotDialog extends plugin
                 or the snapshots for the given object dn */
                        $res = array();
                        if($this->DeletedOnes){
-                               $tmp = $this->getAllDeletedSnapshots($this->dn,true);
+                               if(is_array($this->dn)){
+                                       $tmp = array();
+                                       foreach($this->dn as $dn){
+                                               $tmp = array_merge($tmp,$this->getAllDeletedSnapshots($dn,true));
+                                       }
+                               }else{
+                                       $tmp = $this->getAllDeletedSnapshots($this->dn,true);
+                               }
                        }else{
                                $tmp = $this->Available_SnapsShots($this->dn,true);
                        }

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index a94d4b4d5f3093c61ba7b57194d53c76687a1044..55bece3a5fabdaca887538e2b070ea784e0770c8 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -488,7 +488,12 @@ class systems extends plugin
     }
 
     /* Check if there is a snapshot dialog open */
-    if($str = $this->showSnapshotDialog($this->DivListSystem->selectedBase,"ou=systems,")){
+    $tmp = array();
+    foreach(array("phones","servers","printers","terminals","netdevices","workstations") as $ent){
+      $tmp[] = "ou=".$ent.",ou=systems,".$this->DivListSystem->selectedBase;
+    }
+    
+    if($str = $this->showSnapshotDialog($this->DivListSystem->selectedBase,$tmp)){
       return($str);
     }