From 4f4c2d25ed69c5d21cf9b7a437e6af980f82f1fc Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 28 Feb 2020 17:07:05 +0100
Subject: [PATCH] 69110: Add EPerson and EPerson form mutually exclusive &
 resend search after addEPerson

---
 .../epeople-registry/epeople-registry.component.html         | 2 +-
 .../epeople-registry/epeople-registry.component.ts           | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
index 46c3e8fe12..0a077355c6 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.html
@@ -7,7 +7,7 @@
       <ds-eperson-form *ngIf="isEPersonFormShown" (submitForm)="forceUpdateEPeople()"
                        (cancelForm)="isEPersonFormShown = false"></ds-eperson-form>
 
-      <div class="button-row top d-flex">
+      <div *ngIf="!isEPersonFormShown" class="button-row top d-flex pb-2">
         <button class="mr-auto btn btn-success"
                 (click)="isEPersonFormShown = true">
           <i class="fas fa-plus"></i>
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
index 3994c3e839..6e0bd48af0 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
@@ -85,10 +85,7 @@ export class EPeopleRegistryComponent {
   public forceUpdateEPeople() {
     this.epersonService.clearEPersonRequests();
     this.isEPersonFormShown = false;
-    this.updateEPeople({
-      currentPage: 1,
-      elementsPerPage: this.config.pageSize
-    });
+    this.search({ query: '', scope: 'name' })
   }
 
   /**