From 8274594848fa30f2185d9cbf2437c1a62200b78a Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Mon, 16 Aug 2021 17:03:07 +0200
Subject: [PATCH] [CST-4058] Show EPerson's email address

---
 .../group-form/members-list/members-list.component.html      | 2 ++
 .../group-registry/groups-registry.component.ts              | 5 +++--
 src/assets/i18n/en.json5                                     | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index 51282b49c0..4f8e8090dc 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -93,6 +93,7 @@
         <tr>
           <th scope="col">{{messagePrefix + '.table.id' | translate}}</th>
           <th scope="col">{{messagePrefix + '.table.name' | translate}}</th>
+          <th scope="col">{{messagePrefix + '.table.email' | translate}}</th>
           <th>{{messagePrefix + '.table.edit' | translate}}</th>
         </tr>
         </thead>
@@ -101,6 +102,7 @@
           <td>{{ePerson.eperson.id}}</td>
           <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
                  [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.eperson.name}}</a></td>
+          <td><a href="mailto:{{ePerson.eperson.email}}">{{ePerson.eperson.email}}</a></td>
           <td>
             <div class="btn-group edit-field">
               <button (click)="deleteMemberFromGroup(ePerson)"
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index ce1b7dedd9..da861518da 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -35,6 +35,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-groups-registry',
@@ -132,8 +133,8 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         }
         return this.groupService.searchGroups(this.currentSearchQuery.trim(), {
           currentPage: paginationOptions.currentPage,
-          elementsPerPage: paginationOptions.pageSize
-        });
+          elementsPerPage: paginationOptions.pageSize,
+        }, true, true, followLink('object'));
       }),
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 8908ca42f6..5d6cd7fc9e 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -398,6 +398,8 @@
 
   "admin.access-control.groups.form.members-list.table.name": "Name",
 
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+
   "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
 
   "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",