From 68d7daae5abc05400e4b207d9c88a39bc79ffd6f Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Sat, 10 Aug 2019 21:18:38 -0700
Subject: [PATCH] more idl fun

---
 Open-ILS/examples/fm_IDL.xml                         |  2 +-
 .../app/staff/cat/authorities/manage.component.html  | 20 ++++++++++----------
 .../app/staff/cat/authorities/manage.component.ts    | 17 ++++++++++++-----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index e6cc283df8..1cbe4fe4fa 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -2726,7 +2726,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 			<link field="notes" reltype="has_many" key="record" map="" class="arn"/>
 			<link field="bib_links" reltype="has_many" key="authority" map="" class="abl"/>
 			<link field="fixed_fields" reltype="might_have" key="record" map="" class="ard"/>
-			<link field="simple_heading_record" reltype="might_have" key="record" map="" class="ash"/>
+			<link field="simple_heading_record" reltype="has_many" key="record" map="" class="ash"/>
 		</links>
 		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
 			<actions>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.html b/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.html
index 9bd448ca9e..bbba1cea46 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.html
@@ -1,14 +1,14 @@
 <eg-grid #grid [dataSource]="gridSource"
   persistKey="cat.authorities.manage">
-  <eg-grid-column path="id" label="ID" i18n-label [index]="true" [hidden]="true"></eg-grid-column>
-  <eg-grid-column path="simple_heading_record.sort_value" label="Sort value" i18n-label></eg-grid-column>
-  <eg-grid-column path="simple_heading_record.value" label="Value" i18n-label></eg-grid-column>
-  <eg-grid-column path="simple_heading_record.thesaurus" label="Thesaurus" i18n-label></eg-grid-column>
-  <eg-grid-column path="create_date" label="Date created" i18n-label [hidden]="true"></eg-grid-column>
-  <eg-grid-column path="edit_date" label="Date last edited" i18n-label [hidden]="true"></eg-grid-column>
-  <eg-grid-column path="source.source" label="Record source" i18n-label [hidden]="true"></eg-grid-column>
-  <eg-grid-column path="creator.first_given_name" label="Creator first name" i18n-label></eg-grid-column>
-  <eg-grid-column path="editor.first_given_name" label="Last editor first name" i18n-label></eg-grid-column>
-  <eg-grid-column path="owner.name" label="Owning library" i18n-label></eg-grid-column>
+  <eg-grid-column path="record.id" label="ID" i18n-label [index]="true" [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="sort_value" label="Sort value" i18n-label></eg-grid-column>
+  <eg-grid-column path="value" label="Value" i18n-label></eg-grid-column>
+  <eg-grid-column path="thesaurus" label="Thesaurus" i18n-label></eg-grid-column>
+  <eg-grid-column path="record.create_date" label="Date created" i18n-label [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="record.edit_date" label="Date last edited" i18n-label [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="record.source" label="Record source" i18n-label [hidden]="true"></eg-grid-column>
+  <eg-grid-column path="record.creator.first_given_name" label="Creator first name" i18n-label></eg-grid-column>
+  <eg-grid-column path="record.editor.first_given_name" label="Last editor first name" i18n-label></eg-grid-column>
+  <eg-grid-column path="record.owner.name" label="Owning library" i18n-label></eg-grid-column>
 
 </eg-grid>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.ts
index 443b78dc88..5584a1e361 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/authorities/manage.component.ts
@@ -16,11 +16,18 @@ export class ManageAuthoritiesComponent {
         this.gridSource = new GridDataSource();
 
         this.gridSource.getRows = (pager: Pager) => {
-            return this.pcrud.search('are',
-                {deleted: 'false'},
-                {flesh: 1,
-                flesh_fields: {are: ['creator', 'editor', 'owner', 'simple_heading_record']}}
-            );
+            return this.pcrud.search('ash', {
+                'record': { 'in': {
+                    'from': 'are', 'select': {'are': ['id']}, 'where': {'deleted': 'false'}}},
+                'atag': { 'in': {
+                    'from': 'ascaf', 'select': {'ascaf': ['id']}, 'where': {'main_entry': 'true'}}},
+                },
+                {flesh: 2,
+                flesh_fields: {
+                    are: ['creator', 'editor', 'owner'],
+                    ash: ['record']
+                }
+            });
         };
     }
 
-- 
2.11.0