From: psc Date: Sun, 21 Jun 2009 19:47:01 +0000 (+0000) Subject: Apply patch for Trac #225 by mba X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4ab1271b730e06047e450f3430bf9f3c6f35c5c;p=gosa.git Apply patch for Trac #225 by mba Properly show object group membership in system list git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13751 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc index 3bbfdd55d..51f2171f8 100644 --- a/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc +++ b/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc @@ -385,18 +385,19 @@ class divListSystem extends MultiSelectWindow $cnts[$type] ++; /* Create each field */ + $filtered_dn = str_replace('\\,', '\\2C', LDAP::fix($val['dn'])); $field0 = array("string" => "" , "attach" => "style='width:20px;'"); $field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'"); - if(isset($ogs_release[$val['dn']])){ + if(isset($ogs_release[$filtered_dn])){ $field2 = array("string" => sprintf($editlink,$key,$display)." ", - "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($val['dn']))."'"); + sprintf(_("Member of %s object group"),trim($ogs_release[$filtered_dn]['CN'],", "))."'>", + "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($filtered_dn))."'"); }else{ $field2 = array("string" => sprintf($editlink,$key,$display), - "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($val['dn']))."'"); + "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($filtered_dn))."'"); } $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'"); @@ -408,11 +409,11 @@ class divListSystem extends MultiSelectWindow if(isset($val['FAIclass'][0]) && preg_match("/:/",$val['FAIclass'][0])){ $release = preg_replace("/^.*:/","",$val['FAIclass'][0]); $release_attach = ""; - }elseif(isset($ogs_release[$val['dn']])){ - $release = trim($ogs_release[$val['dn']]['STR'],", "). + }elseif(isset($ogs_release[$filtered_dn])){ + $release = trim($ogs_release[$filtered_dn]['STR'],", "). " "; - $release_attach = "title='".sprintf(_("Inherited from %s"),trim($ogs_release[$val['dn']]['CN'],", "))."'"; + title='".sprintf(_("Inherited from %s"),trim($ogs_release[$filtered_dn]['CN'],", "))."'>"; + $release_attach = "title='".sprintf(_("Inherited from %s"),trim($ogs_release[$filtered_dn]['CN'],", "))."'"; } $field2a = array("string" => $release." ","attach"=>$release_attach." style='width:100px;'"); $this->AddElement( array($field0,$field1,$field2,$field2a,$field3));