Apply patch from psc/mba for #225:

- Show inheritance symbol behind system, when object inherited
  attributes from an object group
- Display of FAI-release if member is not a member of an object
  group, but has a release set
- Show the FAI-release if member is member of an object group
  but has its own FAI-release
- Show the inheritance symbol behind the release, if the release
  was inherited from the object group, too.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13716 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 c1e8a305bbececd91642895ef181e6395e83939d..3bbfdd55d7e5617853bd692d43d1e8c701e61bfc 100644 (file)
--- a/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc
+++ b/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc
@@ -389,8 +389,15 @@ class divListSystem extends MultiSelectWindow
           "attach" => "style='width:20px;'");
       $field1 = array("string" => sprintf($img['img'],$val['dn']),
           "attach" => "style='text-align:center;width:20px;'");
-      $field2 = array("string" => sprintf($editlink,$key,$display),
-          "attach" => "style='' title='".preg_replace('/ /', ' ', LDAP::fix($val['dn']))."'");
+      if(isset($ogs_release[$val['dn']])){
+        $field2 = array("string" => sprintf($editlink,$key,$display)."&nbsp;<img src=
+            'plugins/ogroups/images/select_ogroup.png' class='center' alt='' title='".
+            sprintf(_("Member of %s object group"),trim($ogs_release[$val['dn']]['CN'],", "))."'>",
+            "attach" => "style='' title='".preg_replace('/ /', '&nbsp;', LDAP::fix($val['dn']))."'");
+      }else{
+        $field2 = array("string" => sprintf($editlink,$key,$display),
+            "attach" => "style='' title='".preg_replace('/ /', '&nbsp;', LDAP::fix($val['dn']))."'");
+      }
       $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action),
           "attach" => "style='width:".$action_col_size."px;border-right:0px;text-align:right;'");