X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiPartitionTable.inc;h=f6adfeb34f8aae34c3072253f33598490213b228;hb=a3791b96142d4db65d975225b0f779bcf49ba0a8;hp=ca107408b685b35d7e5cc6bc82ca78f1f0588c81;hpb=84d2c065af9ce3f287fef380606a593a0cda5a81;p=gosa.git diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc index ca107408b..f6adfeb34 100644 --- a/plugins/admin/fai/class_faiPartitionTable.inc +++ b/plugins/admin/fai/class_faiPartitionTable.inc @@ -100,16 +100,23 @@ class faiPartitionTable extends plugin /* Edit disk. * Open dialog which allows us to edit the selected entry */ - $_SESSION['objectinfo'] = $this->dn; + + if($this->dn != "new"){ + $_SESSION['objectinfo']= $this->dn; + } + if((isset($_POST['EditDisk']))&&(isset($_POST['disks']))){ $usedDiskNames =array(); + + $Udisk = $_POST['disks'][0]; + foreach($this->disks as $key=>$disk){ - if($key != $_POST['disks']){ + if($key != $Udisk){ $usedDiskNames[]= $key; } } - $this->dialog = new faiPartitionTableEntry($this->config,$this->dn,$usedDiskNames,$this->disks[$_POST['disks']]); - $_SESSION['objectinfo'] = $this->disks[$_POST['disks']]['dn']; + $this->dialog = new faiPartitionTableEntry($this->config,$this->dn,$usedDiskNames,$this->disks[$Udisk]); + $_SESSION['objectinfo'] = $this->disks[$Udisk]['dn']; $this->is_dialog = true; } @@ -161,21 +168,23 @@ class faiPartitionTable extends plugin * Assign delete status for all its partitions */ if((isset($_POST['DelDisk']))&&(!empty($_POST['disks']))){ - $disk = $_POST['disks']; - if($this->disks[$disk]['status']=="edited"){ - $this->disks[$disk."-delete"]=$this->disks[$disk]; - unset($this->disks[$disk]); - $disk = $disk."-delete"; - $this->disks[$disk]['status']="delete"; - foreach($this->disks[$disk]['partitions'] as $name => $value ){ - if($value['status']=="edited"){ - $this->disks[$disk]['partitions'][$name]['status']="delete"; - }else{ - unset($this->disks[$disk]['partitions'][$name]); + + foreach($_POST['disks'] as $disk) { + if($this->disks[$disk]['status']=="edited"){ + $this->disks[$disk."-delete"]=$this->disks[$disk]; + unset($this->disks[$disk]); + $disk = $disk."-delete"; + $this->disks[$disk]['status']="delete"; + foreach($this->disks[$disk]['partitions'] as $name => $value ){ + if($value['status']=="edited"){ + $this->disks[$disk]['partitions'][$name]['status']="delete"; + }else{ + unset($this->disks[$disk]['partitions'][$name]); + } } + }else{ + unset($this->disks[$disk]); } - }else{ - unset($this->disks[$disk]); } }