From 05abce1db4c262dd25b7a4075357faea9a014e36 Mon Sep 17 00:00:00 2001
From: Jane Sandberg <sandbej@linnbenton.edu>
Date: Thu, 25 Jun 2020 17:22:40 -0700
Subject: [PATCH] LP 1857351: reorder a few other fm-editors

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
---
 .../src/eg2/src/app/staff/admin/local/address-alert.component.html    | 2 +-
 .../src/eg2/src/app/staff/admin/local/admin-carousel.component.html   | 4 ++--
 .../src/eg2/src/app/staff/booking/reservations-grid.component.html    | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
index 6d5f0cb1dd..da7c997a89 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/address-alert.component.html
@@ -13,5 +13,5 @@
 <eg-staff-banner bannerText="Address Alert Configuration" i18n-bannerText>
 </eg-staff-banner>
 <eg-admin-page persistKeyPfx="local" idlClass="aal"
+  fieldOrder="owner,alert_message,street1,street2,city,county,state,post_code,country,billing_address,mailing_address,match_all,active,id"
   [helpTemplate]="helpTemplate"></eg-admin-page>
-
diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-carousel.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-carousel.component.html
index f1cedc7f3a..3f507514f3 100644
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/admin-carousel.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/admin-carousel.component.html
@@ -89,11 +89,11 @@
 </ng-template>
 
 <eg-fm-record-editor #editDialog idlClass="{{idlClass}}" 
-    [preloadLinkedValues]="true" readonlyFields="last_refresh_time"
+    [preloadLinkedValues]="true"
+    fieldOrder="owner,name,type,age_filter,max_items,owning_lib_filter,copy_location_filter,active,id,bucket,last_refresh_time,creator,create_time,editor,edit_time"
     hiddenFieldsList="creator,editor,create_time,edit_time"
     [preSave]="mungeCarousel" (recordSaved)="postSave($event)"
     readonlyFields="last_refresh_time"
     [fieldOptions]="{bucket:{customTemplate:{template:bucketTemplate}},copy_location_filter:{customTemplate:{template:locationTemplate}},owning_lib_filter:{customTemplate:{template:orgTemplate}}}"
 ></eg-fm-record-editor>
 
-
diff --git a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
index 42f4b3eef3..6cd90f3d45 100644
--- a/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/booking/reservations-grid.component.html
@@ -54,6 +54,7 @@
   idlClass="bresv"
   datetimeFields="start_time,end_time"
   [fieldOptions]="{end_time:{customTemplate:{template:endTimeTemplate}}}"
+  fieldOrder="usr,start_time,end_time,request_time,capture_time,pickup_time,email_notify,unrecovered,billing_total,payment_total,fine_interval,fine_amount,max_fine,current_resource,note,target_resource_type,request_lib,pickup_lib"
   hiddenFields="xact_start,xact_finish,cancel_time,booking_interval"
   [readonlyFields]="listReadOnlyFields()">
 </eg-fm-record-editor>
-- 
2.11.0