Index: /WAeUP_SRP/trunk/skins/waeup_directory/search_members.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_directory/search_members.py	(revision 1898)
+++ /WAeUP_SRP/trunk/skins/waeup_directory/search_members.py	(revision 1899)
@@ -12,4 +12,9 @@
 from Products.CPSDirectory.BaseDirectory import SearchSizeLimitExceeded
 from Products.AdvancedQuery import Eq, Between, Le,In
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 try:
     aq_portal = context.portal_catalog.evalAdvancedQuery
@@ -32,4 +37,6 @@
 ##                  {'id': id_field, 'title': 'label_user_name'},
 ##                  ]
+if dir.getId() == "members":
+    result_fields.append({'id': 'groups', 'title': 'Group(s)'})
 
 return_fields = []
@@ -58,5 +65,4 @@
     rendered = dir.member_search_errors(exception=e)
     return rendered, 'results'
-
 for field, process_meth in process_fields.items():
     meth = getattr(context, process_meth, None)
@@ -93,5 +99,8 @@
                 roles.append(r)
     item[1]['roles'] = roles
-rendered = dir.search_members_results(results=results)
+    if "groups" in return_fields:
+        item[1]['groups'] = " ".join(item[1]['groups'])
+        
+rendered = dir.search_members_results(results=results,result_fields=result_fields)
 
 return rendered, 'results'
Index: /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt	(revision 1898)
+++ /WAeUP_SRP/trunk/skins/waeup_directory/search_members_results.pt	(revision 1899)
@@ -11,5 +11,5 @@
   dirname here/getId;
   title_field here/title_field;
-  fields python:here.getDirectoryResultFields(dirname);
+  fields options/result_fields;
   isAdmin python:here.portal_membership.getAuthenticatedMember().has_role(['Manager',]);
   cpsmcat nocall:here/translation_service;
@@ -40,7 +40,11 @@
                 </tal:block>
                 <td>
+              <span tal:condition="repeat/field/start">
                   <a href="."
                     tal:attributes="href string:${portal_url}/member_view?id=${id}"
                     ><strong tal:content="structure python:data.get(field['id'])">john</strong></a>
+              </span>
+              <span tal:condition="not:repeat/field/start"
+                    tal:content="structure python:data.get(field['id'])" />
                 </td>
               </tal:block>
