From: hickert Date: Fri, 7 Aug 2009 06:46:51 +0000 (+0000) Subject: Updated FAI partitions X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0c922c85b05323929f4d6d1a2e1d3eb7bacf7e81;p=gosa.git Updated FAI partitions -Reenabled the old style partitions. Fixed problems while saving. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13987 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 5b8eb3138..63bcc0c4b 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -285,12 +285,12 @@ class faiPartitionTable extends plugin break; case 'old': $this->dialog = new faiPartitionTableEntry( - $this->config,$this->dn,$usedDiskNames,$this->disks[$s_entry]); + $this->config,$this->dn,$this->getUsedDiskNames(),$this->disks[$s_entry]); break; } }else{ $this->dialog = new faiPartitionTableEntry( - $this->config,$this->dn,$usedDiskNames,$this->disks[$s_entry]); + $this->config,$this->dn,$this->getUsedDiskNames(),$this->disks[$s_entry]); } if($this->dialog){ $this->dialog->set_acl_base($this->acl_base_for_current_object($dn)); @@ -448,6 +448,11 @@ class faiPartitionTable extends plugin } + function getUsedDiskNames() + { + return(array()); + } + /* Delete me, and all my subtrees */ diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc index 0efc24c10..d8a4f5bae 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc @@ -308,6 +308,7 @@ class faiPartitionTableEntry extends plugin /* Attach partitions */ foreach($this->partitions as $key=>$val) { $this->partitions[$key]['FAIpartitionNr']=$key; + $this->partitions[$key]['cn']=$key; } /* Attach deleted */