From 588859dd8e090d28b6425fef381140f09eb6f036 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mikejritter@users.noreply.github.com>
Date: Mon, 4 Mar 2024 19:33:59 -0700
Subject: [PATCH] DRYD-1397: Add controlled object and material and fix
 ordering (#16)

Co-authored-by: Ray Lee <ray.lee@lyrasis.org>
---
 src/plugins/recordTypes/collectionobject/forms/default.jsx | 4 ++--
 src/plugins/recordTypes/collectionobject/forms/photo.jsx   | 2 ++
 src/plugins/recordTypes/collectionobject/forms/public.jsx  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/recordTypes/collectionobject/forms/default.jsx b/src/plugins/recordTypes/collectionobject/forms/default.jsx
index 05b4b57..8bc0b61 100644
--- a/src/plugins/recordTypes/collectionobject/forms/default.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/default.jsx
@@ -113,8 +113,8 @@ const template = (configContext) => {
 
         <Field name="objectNameList">
           <Field name="objectNameGroup">
-            <Field name="objectName" />
             <Field name="objectNameControlled" />
+            <Field name="objectName" />
             <Field name="objectNameCurrency" />
             <Field name="objectNameLevel" />
             <Field name="objectNameSystem" />
@@ -177,8 +177,8 @@ const template = (configContext) => {
 
         <Field name="materialGroupList">
           <Field name="materialGroup">
-            <Field name="material" />
             <Field name="materialControlled" />
+            <Field name="material" />
             <Field name="materialComponent" />
             <Field name="materialComponentNote" />
             <Field name="materialName" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/photo.jsx b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
index 72615f2..970ed00 100644
--- a/src/plugins/recordTypes/collectionobject/forms/photo.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
@@ -74,6 +74,7 @@ const template = (configContext) => {
 
         <Field name="objectNameList">
           <Field name="objectNameGroup">
+            <Field name="objectNameControlled" />
             <Field name="objectName" />
             <Field name="objectNameCurrency" />
             <Field name="objectNameLevel" />
@@ -112,6 +113,7 @@ const template = (configContext) => {
 
         <Field name="materialGroupList">
           <Field name="materialGroup">
+            <Field name="materialControlled" />
             <Field name="material" />
             <Field name="materialComponent" />
             <Field name="materialComponentNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/public.jsx b/src/plugins/recordTypes/collectionobject/forms/public.jsx
index d4dbc0a..43b3eea 100644
--- a/src/plugins/recordTypes/collectionobject/forms/public.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/public.jsx
@@ -62,6 +62,7 @@ const template = (configContext) => {
 
         <Field name="objectNameList">
           <Field name="objectNameGroup">
+            <Field name="objectNameControlled" />
             <Field name="objectName" />
             <Field name="objectNameCurrency" />
             <Field name="objectNameLevel" />
@@ -81,6 +82,7 @@ const template = (configContext) => {
 
         <Field name="materialGroupList">
           <Field name="materialGroup">
+            <Field name="materialControlled" />
             <Field name="material" />
             <Field name="materialComponent" />
             <Field name="materialComponentNote" />