From 6e55ca14641da808c50cafc8601a3d43f9e12bc9 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 29 Mar 2010 13:22:58 +0000 Subject: [PATCH] Updated class fai Management git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17354 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/class_faiManagement.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index 1bc9583c9..1e07bb848 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -430,7 +430,7 @@ class faiManagement extends management add_lock ($this->dns, $this->ui->dn); $smarty->assign("info",msgPool::deleteInfo($dns_names)); - return($smarty->fetch(get_template_path('removeEntries.tpl', TRUE))); + return($smarty->fetch(get_template_path('removeEntries.tpl'))); } } } @@ -439,7 +439,7 @@ class faiManagement extends management /*! \brief Entry removal is confirmed, now remove objects */ function removeEntryConfirmed($action="",$target=array(),$all=array(), - $altTabClass="",$altTabType="",$altAclCategory="") + $altTabClass="",$altTabType="",$altAclCategory="", $altAclPlugin="") { $ldap = $this->config->get_ldap_link(); $ldap->cd($this->config->current['BASE']); @@ -450,14 +450,12 @@ class faiManagement extends management if($ldap->count()){ $attrs = $ldap->fetch(); $type= $this->get_type($attrs); - $acl = $this->ui->get_permissions($dn,"fai/".$type[1]); if(preg_match("/d/",$acl)){ // Now save changes - $str = management::removeEntryConfirmed($action,array($dn),$all,$type[0],$type[2],$type[1]); + $str = management::removeEntryConfirmed($action,array($dn),$all,$type[0],$type[2],"fai",$type[1]); if(!empty($str)) return($str); - FAI::save_release_changes_now(); $to_del = FAI::clean_up_releases($dn); foreach($to_del as $dn){ $ldap->rmdir_recursive($dn); @@ -469,6 +467,9 @@ class faiManagement extends management } } } + if(count($this->dns)){ + FAI::save_release_changes_now(); + } /* Normally this shouldn't be reached, send some extra logs to notify the administrator */ -- 2.30.2