From 328306c47f0b5aad121048af93e8ec26ddcde577 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 22 Aug 2019 10:12:53 -0400
Subject: [PATCH] LP1837656 Org proximity admin disable org filter

Disable the org unit filter for the auto-generated org unit proximity
adjustment admin page so that it does not automatically filter the grid by
any of the org unit fields.

Modify the IDL to indicate that the 'pos' field on the org unit
proximity adjustement class is required.

To test:

1. Navigate to
   /eg2/en-US/staff/admin/server/actor/org_unit_proximity_adjustment
2. Create an adjustment if non exist.
3. Confirm the 'Position' field is now required.
4. Confirm new adjusment row appears in the grid after it's created.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/examples/fm_IDL.xml                                  | 2 +-
 Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index d28d7084d7..dfda9be113 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6128,7 +6128,7 @@ SELECT  usr,
 			<field name="hold_request_lib" reporter:label="Hold Request Lib" reporter:datatype="org_unit"/>
 			<field name="copy_location" reporter:label="Copy Location" reporter:datatype="link"/>
 			<field name="circ_mod" reporter:label="Circ Modifier" reporter:datatype="link"/>
-			<field name="pos" reporter:label="Position" reporter:datatype="int" />
+			<field name="pos" reporter:label="Position" reporter:datatype="int" oils_obj:required="true" />
 			<field name="absolute_adjustment" reporter:label="Absolute adjustment?" reporter:datatype="bool" />
 			<field name="prox_adjustment" reporter:label="Proximity Adjustment" reporter:datatype="number" />
 		</fields>
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
index c971ed74a7..445f446553 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/server/routing.module.ts
@@ -11,6 +11,11 @@ const routes: Routes = [{
     path: 'actor/org_unit_type',
     component: OrgUnitTypeComponent
 }, {
+    path: 'actor/org_unit_proximity_adjustment',
+    component: BasicAdminPageComponent,
+    data: [{schema: 'actor',
+        table: 'org_unit_proximity_adjustment', disableOrgFilter: true}]
+}, {
     path: ':schema/:table',
     component: BasicAdminPageComponent
 }];
-- 
2.11.0