From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 9 Jul 2018 21:52:24 +0000 (-0400)
Subject: LP#1775466 Avoid workstation removal login loop
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=351217851ad762f795984f353f89173fe8be9a05;p=working%2FEvergreen.git

LP#1775466 Avoid workstation removal login loop

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts
index b8e1b95d89..d33bf0b0d1 100644
--- a/Open-ILS/src/eg2/src/app/staff/login.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts
@@ -59,8 +59,12 @@ export class StaffLoginComponent implements OnInit {
         // post-login URL
         let url: string = this.auth.redirectUrl || '/staff/splash';
 
-        // prevent sending the user back to the login page.
-        if (url.startsWith('/staff/login')) { url = '/staff/splash'; }
+        // prevent sending the user back to the login page or looping
+        // back to the workstation removal page.
+        if (url.startsWith('/staff/login') ||
+            url.startsWith('/staff/admin/workstation/workstations/remove/')) { 
+            url = '/staff/splash'; 
+        }
 
         const workstation: string = this.args.workstation;