LP#1626157 global search holdings fix

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

diff --git a/Open-ILS/src/eg2/src/app/core/store.ts b/Open-ILS/src/eg2/src/app/core/store.ts
index 2b3522b..218ad83 100644 (file)
--- a/Open-ILS/src/eg2/src/app/core/store.ts
+++ b/Open-ILS/src/eg2/src/app/core/store.ts
@@ -10,7 +10,9 @@ export class EgStoreService {
     
     // Base path for cookie-based storage.
     // Useful for limiting cookies to subsections of the application.
-    loginSessionBasePath: string;
+    // Store cookies globally by default.
+    // Note cookies shared with /eg/staff must be stored at "/"
+    loginSessionBasePath: string = '/';
 
     // Set of keys whose values should disappear at logout.
     loginSessionKeys: string[] = [

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
index a8e9417..b8e05f0 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/copies.component.ts
@@ -46,12 +46,19 @@ export class CopiesComponent implements OnInit {
 
     fetchCopies(): void {
         this.copies = [];
+
+        // "Show Result from All Libraries" i.e. global search displays
+        // copies from all branches, sorted by search/pref libs.
+        let copy_depth = this.staffCat.searchContext.global ?
+            this.org.root().ou_type().depth() :
+            this.staffCat.searchContext.searchOrg.ou_type().depth(); 
+
         this.net.request(
             'open-ils.search',
             'open-ils.search.bib.copies.staff',
             this.recId,
             this.staffCat.searchContext.searchOrg.id(),
-            this.staffCat.searchContext.searchOrg.ou_type().depth(), // TODO
+            copy_depth,
             this.pager.limit,
             this.pager.offset,
             this.staffCat.prefOrg ? this.staffCat.prefOrg.id() : null 

diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
index d37ca2f..63a86f9 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts
@@ -38,7 +38,7 @@ export class EgStaffResolver implements Resolve<Observable<any>> {
         // NOTE: storing session data at '/' so it can be shared by
         // Angularjs apps.
         this.store.loginSessionBasePath = '/';
-            //this.ngLocation.prepareExternalUrl('/staff');
+        // ^-- = this.ngLocation.prepareExternalUrl('/staff');
 
         // Not sure how to get the path without params... using this for now.
         let path = state.url.split('?')[0]