Added release tag for group list

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3140 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 4bcf7ed0706487ec0682b1ba5f9ce254f96bf08c..a48df89c1fbe3221cf8507fa253cd01fe717d558 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -521,7 +521,13 @@ class groupManagement extends plugin
         $desc = "";
       }else{
         $desc = " - [ ".$val['description'][0]." ]";
-      }      
+      } 
+    
+      /* FAIrelease tag from groupApplications */    
+      if(isset($val['FAIrelease'][0])){
+        $desc .= " (".$val['FAIrelease'][0].")";
+      }
+ 
       $field1 = array("string" => sprintf($userimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
       $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
       $field3 = array("string" => preg_replace("/%KEY%/", $key, $posix." ".$enviro." ".$mail." ".$samba." ".$appl." ".$phone), "attach" => "style='width:136px;'");  
@@ -645,14 +651,20 @@ class groupManagement extends plugin
       }
     }
 
-    /* Depending on $CreatePosixsList we have to create different lists */
+
+    /* Create attribute array, if releasemanagement is activated we search for FAIrelease too */
+    $attrs = array("cn", "description", "gidNumber", "objectClass");
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    if($tmp){
+      $attrs[] = "FAIrelease";
+    }
 
     if ($groupfilter['subsearch'] == "checked"){
-      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber", "objectClass"),
+      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber", "objectClass","FAIrelease"),
                      GL_SIZELIMIT);
     } else {
       $base= get_groups_ou().$base;
-      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber", "objectClass"),
+      $res= get_list($filter, $this->ui->subtreeACL, $base, array("cn", "description", "gidNumber", "objectClass","FAIrelease"),
                      GL_SIZELIMIT);
     }
     if (preg_match("/size limit/i", $error) || preg_match("/size limit/i", $error2)){