DRYD-1397: Add controlled object and material and fix ordering (#16)

Co-authored-by: Ray Lee <[email protected]>
collectionspace · Mar 5, 2024 · 588859d · 588859d
1 parent 424570d
commit 588859d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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" />