From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 5 Aug 2019 14:44:55 +0000 (-0400)
Subject: LP1830391 Hatch core mod import/export repairs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fberick%2Flp1830391-hatch-omnibus-java-workstations-files-2;p=working%2FEvergreen.git

LP1830391 Hatch core mod import/export repairs

No need to import/export HatchService from the base common module since
it's now a core service which is exported automatically to root.

Includes minor lint repair.

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

diff --git a/Open-ILS/src/eg2/src/app/common.module.ts b/Open-ILS/src/eg2/src/app/common.module.ts
index ad62290554..527b698d0c 100644
--- a/Open-ILS/src/eg2/src/app/common.module.ts
+++ b/Open-ILS/src/eg2/src/app/common.module.ts
@@ -14,7 +14,6 @@ They do not have to be added to the providers list.
 */
 
 // consider moving these to core...
-import {HatchService} from '@eg/share/print/hatch.service';
 import {HtmlToTxtService} from '@eg/share/util/htmltotxt.service';
 import {PrintService} from '@eg/share/print/print.service';
 
@@ -71,7 +70,6 @@ export class EgCommonModule {
             ngModule: EgCommonModule,
             providers: [
                 HtmlToTxtService,
-                HatchService,
                 PrintService
             ]
         };
diff --git a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
index ecfe67adcc..34d6666c30 100644
--- a/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
+++ b/Open-ILS/src/eg2/src/app/share/accesskey/accesskey.service.ts
@@ -24,9 +24,9 @@ export class AccessKeyService {
         // Most recent assignment always wins.
         this.assignments.forEach(a => {
             if (a.key === assn.key) {
-                if (a.ctx === assn.ctx) { 
+                if (a.ctx === assn.ctx) {
                     // If key and context match, keep only the most recent.
-                    return; 
+                    return;
                 } else {
                     // An assignment within a different context shadows
                     // an existing assignment.  Keep the assignment