diff --git a/CHANGELOG.md b/CHANGELOG.md index e48e54f28..b39f698d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,25 @@ ### Procedures -#### CollectionObject +#### Acquisition + +* Add free text field `acquisitionDescription` +* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` + +#### Consultation + +* Add repeatable field `consultationOutcomes/consultationOutcome` + +#### Deaccession + +* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` + +### CollectionObject * **Anthro** Add material/technique description free text field +* Add repeating autocomplete field `controlledContentPlaces/controlledContentPlace` -#### Media +### Media * Add `mini="list"` to alt text @@ -26,9 +40,21 @@ * Update default terms to catalog note, legacy data note, and staff note +#### Inventory Status + +**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** + +* Update default terms to deaccessions, in storage, missing, off site, on loan, and on display + +#### NAGPRA Involved Role + +**FCART** + +* Added existing default terms to profile + #### Organization Types -**Core, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** +**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** * Add federally-recognized tribe and non-federally-recognized tribe to default terms @@ -39,7 +65,7 @@ ## 8.2.0 -## Procedures +### Procedures ### CollectionObject @@ -61,12 +87,12 @@ * Add field `note` -## Profiles +### Profiles -### Anthro +#### Anthro * Remove `anthroOwnershipAccess` from `CollectionObject` -### FCART +#### FCART * Add `deaccessionreason` term list to fcart profile instance vocabularies diff --git a/pom.xml b/pom.xml index 0e2349a4e..06d5885d4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.3.0-RC.1 + 8.3.0-RC.2 ${revision} ${basedir}/tmp csmake diff --git a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml index d2646c9b1..76d210d6a 100644 --- a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml +++ b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml @@ -254,6 +254,9 @@ + + + diff --git a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml index 9134c58ca..e60a3eacf 100644 --- a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml @@ -5,33 +5,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml index 8b3780eb7..bc9f5c763 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml @@ -50,6 +50,7 @@ + @@ -59,6 +60,11 @@ + + + + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml index d41e6f7b3..7d81d00f3 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml @@ -35,6 +35,10 @@ + + + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml index 461ab122f..1d815e82c 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml @@ -36,6 +36,12 @@ + + + + + + diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml index c53452b32..594aa7ff6 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml @@ -5,33 +5,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + @@ -58,7 +37,7 @@ - + uocuserroles uocuserroles Use of Collections User Roles @@ -1571,4 +1550,15 @@ + + nagprainvolvedrole + nagprainvolvedrole + NAGPRA Involved Role + + + + + + + diff --git a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml index 8057f60c7..da39233ef 100644 --- a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml @@ -7,33 +7,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + diff --git a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml index 32d675682..c46ddbd35 100644 --- a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml @@ -7,33 +7,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - +