From 2a794ff44605b107d825888fd6ab57f6385938e0 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 6 Jan 2010 09:30:20 +0000 Subject: [PATCH] Updated FAI git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15075 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/fai/admin/fai/class_faiManagement.inc | 6 ++++++ gosa-plugins/fai/admin/fai/class_filterFAI.inc | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc index d8b8f15bb..7a23abecd 100644 --- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc +++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc @@ -106,6 +106,9 @@ class faiManagement extends management $data = array_pop($entry['GROUPS']); $type = $this->get_type($data); management::editEntry('editEntry',array($data['dn']),array(),$type[0],$type[2],$type[1]); + $this->tabObject->by_object[$type[1]]->FAIstate = $data['FAIstate']; + $this->tabObject->read_only = preg_match("/freeze/i", $data['FAIstate']); + }else{ $this->dialogObject = new faiGroupHandle($entry['GROUPS'],"edit"); } @@ -163,6 +166,9 @@ class faiManagement extends management $data = array_pop($entry); $type = $this->get_type($data); management::editEntry('editEntry',array($data['dn']),array(),$type[0],$type[2],$type[1]); + $this->tabObject->by_object[$type[1]]->FAIstate = $data['FAIstate']; + $this->tabObject->read_only = preg_match("/freeze/i", $data['FAIstate']); + }elseif($this->dialogObject instanceOf faiGroupHandle && $this->dialogObject->get_mode() == "remove"){ $this->dialogObject->save_object(); $to_delete = $entry = $this->dialogObject->get_selected(); diff --git a/gosa-plugins/fai/admin/fai/class_filterFAI.inc b/gosa-plugins/fai/admin/fai/class_filterFAI.inc index 06ae4ef79..49d6d9a54 100644 --- a/gosa-plugins/fai/admin/fai/class_filterFAI.inc +++ b/gosa-plugins/fai/admin/fai/class_filterFAI.inc @@ -59,10 +59,11 @@ class filterFAI extends filterLDAP{ if(!preg_match("/freeze/i", $entry['FAIstate'])){ $obj['objectClass'][] = "FAKE_OC_IsBranch"; } + $object['FAIstate'] = $entry['FAIstate']; $obj['TYPES'][] = $type; $obj['GROUPS'][$type] = $object; - + if(!isset($result[$obj['cn']])){ $result[$obj['cn']] = $obj; }else{ -- 2.30.2