From 9c5ed1221a99143fc0e7b035c7a2f227f5bd5126 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 14 Jun 2006 05:40:46 +0000 Subject: [PATCH] Updated system mangement snapshot && snapshot dialog git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3804 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_SnapShotDialog.inc | 9 ++++++++- plugins/admin/systems/class_systemManagement.inc | 7 ++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plugins/admin/systems/class_SnapShotDialog.inc b/plugins/admin/systems/class_SnapShotDialog.inc index 213bde0ae..dcac0b80c 100755 --- 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 a94d4b4d5..55bece3a5 100644 --- 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); } -- 2.30.2