LP1904036 3.9 merge repairs

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
index 77d19ca..493dde5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/catalog.module.ts
@@ -76,7 +76,7 @@ import {WorkLogModule} from '@eg/staff/share/worklog/worklog.module';
     BookingModule,
     PatronModule,
     MarcEditModule,
-    HttpClientModule
+    HttpClientModule,
     BarcodesModule,
     WorkLogModule
   ],

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 6c7b64d..956b18c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/login.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts
@@ -6,9 +6,6 @@ import {StoreService} from '@eg/core/store.service';
 import {OrgService} from '@eg/core/org.service';
 import {OfflineService} from '@eg/staff/share/offline.service';
 
-// Direct users to the AngJS splash page when no routeTo is provided.
-const SPLASH_PAGE_PATH = '/eg/staff/splash';
-
 @Component({
   templateUrl : './login.component.html'
 })
@@ -78,10 +75,10 @@ export class StaffLoginComponent implements OnInit {
     handleSubmit() {
 
         // post-login URL
-        let url: string = this.routeTo || SPLASH_PAGE_PATH;
+        let url: string = this.routeTo || '/staff/splash';
 
         // prevent sending the user back to the login page
-        if (url.match('/staff/login')) { url = SPLASH_PAGE_PATH; }
+        if (url.match('/staff/login')) { url = '/staff/splash'; }
 
         const workstation: string = this.args.workstation;