[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. 9f0fe2cbc7d94e559a52d32ca1bc60cb9321ec3c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_4 has been updated
       via  9f0fe2cbc7d94e559a52d32ca1bc60cb9321ec3c (commit)
      from  f6ca7e0830fae9efe9b0a673b9cf03945dc4a22d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f0fe2cbc7d94e559a52d32ca1bc60cb9321ec3c
Author: Bill Erickson <berickxx at gmail.com>
Date:   Thu Aug 22 10:12:53 2019 -0400

    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 at gmail.com>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 856c2128ca..7e06453e25 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -6135,7 +6135,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 6ce93653e4..d806245a64 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
@@ -22,6 +22,11 @@ const routes: Routes = [{
     path: 'actor/org_unit',
     loadChildren: '@eg/staff/admin/server/org-unit.module#OrgUnitModule'
 }, {
+    path: 'actor/org_unit_proximity_adjustment',
+    component: BasicAdminPageComponent,
+    data: [{schema: 'actor',
+        table: 'org_unit_proximity_adjustment', disableOrgFilter: true}]
+}, {
     path: ':schema/:table',
     component: BasicAdminPageComponent
 }];

-----------------------------------------------------------------------

Summary of changes:
 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(-)


hooks/post-receive
-- 
Evergreen ILS