diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 7f40c58b622ca2f8f96ce3bf2cb7aa12f3b9a4ff..3fd299e6bae458c1c3231a4709721bf075788856 100644 (file)
****************/
if ($s_action=="del_multiple" ||
- $this->dialog instanceOf faiGroupHandle && $this->dialog->get_mode() == "remove"){
+ $this->dialog instanceOf faiGroupHandle &&
+ $this->dialog->get_mode() == "remove" &&
+ !isset($_POST['delete_multiple_fai_object_cancel'])){
/* Collect objects to delete and check if objects are freezed
*/
if(isset($_POST['delete_multiple_fai_object_cancel'])){
$this->remove_lock();
$this->dns = array();
+ $this->dialog = FALSE;
}
/****************
$ldap->cd($this->dn);
foreach($to_del as $dn){
/* Only delete subobjects of the current FAI class */
- $cn = $ldap->getCn($dn);
- $ldap->search("cn=$cn", array('dn'));
+ $ldap->cd($this->dn);
+ $ldap->search("(|(objectClass=FAIclass)(objectClass=FAIdebconfInfo))", array('dn'));
if ($ldap->count()){
while($attrs = $ldap->fetch()){
if ($attrs['dn'] == $dn) {
}
$res = FAI::get_all_objects_for_given_base($base,"(|".$f.")",TRUE);
}else{
- $res = FAI::get_all_objects_for_given_base($base,"(objectClass=".$oc.")",TRUE);
+ $res = FAI::get_all_objects_for_given_base($base,"(|(objectClass=FAIprofile)(objectClass=".$oc."))",TRUE);
}
$delete = array();
$used = array();