From: Jeff Davis Date: Thu, 28 Nov 2019 21:15:48 +0000 (-0800) Subject: LP#1848550 / LP#1835128: force redirect to AngJS login via StaffLoginComponent X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fjeffdavis%2Flp1848550-cache-settings-no-cachedate;p=working%2FEvergreen.git LP#1848550 / LP#1835128: force redirect to AngJS login via StaffLoginComponent The Angular and AngularJS clients have separate login flows. This commit redirects the Angular login page to its AngularJS equivalent, for two reasons: 1. It provides a more consistent user experience. 2. AngularJS login clears settings from the Lovefield-based offline cache. Angular login can't easily do that because the Angular client doesn't use Lovefield. Signed-off-by: Jeff Davis --- 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 de889f9fb2..60054403e2 100644 --- a/Open-ILS/src/eg2/src/app/staff/login.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts @@ -33,6 +33,10 @@ export class StaffLoginComponent implements OnInit { // clear out any stale auth data this.auth.logout(); + // redirect to AngularJS login (LP#1848550/LP#1835128) + window.location.href = '/eg/staff/login'; + + /* // Focus username this.renderer.selectRootElement('#username').focus(); @@ -40,6 +44,7 @@ export class StaffLoginComponent implements OnInit { this.args.workstation = this.store.getLocalItem('eg.workstation.default'); this.applyWorkstation(); + */ } applyWorkstation() {