Skip to content

Merge Release 8.3.0-RC.2 #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikejritter merged 8 commits into from
Feb 24, 2026
Merged

Merge Release 8.3.0-RC.2 #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c341d9a
DRYD-2019: Add controlled content place (#333)
mikejritter Feb 4, 2026
fa0ec42
DRYD-2008: Procedure > Acquisition > Create new Acquisition Descripti…
spirosdi Feb 9, 2026
d5bed42
Multiple Procedures > Add Parties Involved Group (#335)
mikejritter Feb 11, 2026
514270c
Multiple Procedures > Update CHANGELOG for Parties Involved (#336)
mikejritter Feb 11, 2026
2e2dc57
DRYD-2028: Procedure > Consultation > Add consultation outcome (#337)
mikejritter Feb 16, 2026
ca38aa6
DRYD-1909: Term List > Update Inventory Status Terms (#338)
mikejritter Feb 19, 2026
0e7b72c
DRYD-2009: Add NAGPRA Involved Role terms to FCART (#339)
mikejritter Feb 24, 2026
52f18fc
Release Prepare 8.3.0-RC.2
mikejritter Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 33 additions & 7 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -39,7 +65,7 @@

## 8.2.0

## Procedures
### Procedures

### CollectionObject

Expand All @@ -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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>Root</name>

<properties>
<revision>8.3.0-RC.1</revision>
<revision>8.3.0-RC.2</revision>
<cspace.services.version>${revision}</cspace.services.version>
<temp.war.location>${basedir}/tmp</temp.war.location>
<cspace.tool.csmake>csmake</cspace.tool.csmake>
Expand Down
3 changes: 3 additions & 0 deletions tomcat-main/src/main/resources/defaults/base-collectionobject.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,9 @@
<repeat id="contentPersons">
<field id="contentPerson" autocomplete="true" />
</repeat>
<repeat id="controlledContentPlaces">
<field id="controlledContentPlace" autocomplete="true" />
</repeat>
<repeat id="contentPlaces">
<field id="contentPlace" />
</repeat>
Expand Down
27 changes: 3 additions & 24 deletions tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,12 @@
<title-ref>inventorystatus</title-ref>
<title>Inventory Status</title>
<options>
<option id="unknown">unknown</option>
<option id="accessionstatusunclear">accession status unclear</option>
<option id="accessioned">accessioned</option>
<option id="deaccessioned">deaccessioned</option>
<option id="destroyed">destroyed</option>
<option id="destructiveanalysis">destructive analysis</option>
<option id="discarded">discarded</option>
<option id="exchanged">exchanged</option>
<option id="intendedfortransfer">intended for transfer</option>
<option id="irregularmuseumnumber">irregular museum number</option>
<option id="instorage">in storage</option>
<option id="missing">missing</option>
<option id="missingininventory">missing in inventory</option>
<option id="notcataloged">not cataloged</option>
<option id="notlocated">not located</option>
<option id="notreceived">not received</option>
<option id="numbernotused">number not used</option>
<option id="objectmount">object mount</option>
<option id="offsite">off site</option>
<option id="onloan">on loan</option>
<option id="partiallydeaccessioned">partially deaccessioned</option>
<option id="partiallyexchanged">partially exchanged</option>
<option id="partiallyrecataloged">partially recataloged</option>
<option id="preacquisition">pre acquisition</option>
<option id="retired">retired</option>
<option id="returnedloanobject">returned loan object</option>
<option id="sold">sold</option>
<option id="stolen">stolen</option>
<option id="transferred">transferred</option>
<option id="ondisplay">on display</option>
</options>
</instance>
<instance id="vocab-uocmethods">
Expand Down
6 changes: 6 additions & 0 deletions tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<field id="objectPurchaseOfferPriceValue" datatype="float" />
<field id="originalObjectPurchasePriceCurrency" autocomplete="true" ui-type="enum" />
<field id="originalObjectPurchasePriceValue" datatype="float" />
<field id="acquisitionDescription" />
<field id="acquisitionReason" />
<field id="acquisitionNote" />
<field id="acquisitionProvisos" />
Expand All @@ -59,6 +60,11 @@
<field id="acquisitionFundingSource" autocomplete="true" />
<field id="acquisitionFundingSourceProvisos" />
</repeat>
<repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
<field id="involvedParty" autocomplete="true" />
<field id="involvedOnBehalfOf" autocomplete="true" />
<field id="involvedRole" autocomplete="true" ui-type="enum" />
</repeat>
</section>
<section id="objectCollectionInformation">
<repeat id="fieldCollectionEventNames">
Expand Down
4 changes: 4 additions & 0 deletions tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
<field id="consultDate" datatype="date" />
<field id="consultNote" />
</repeat>

<repeat id="consultationOutcomes">
<field id="consultationOutcome" />
</repeat>
</section>

</record>
6 changes: 6 additions & 0 deletions tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
<repeat id="exitMethods">
<field id="exitMethod" autocomplete="true" ui-type="enum" />
</repeat>

<repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
<field id="involvedParty" autocomplete="true" />
<field id="involvedOnBehalfOf" autocomplete="true" />
<field id="involvedRole" autocomplete="true" ui-type="enum" />
</repeat>
</section>

</record>
40 changes: 15 additions & 25 deletions tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,12 @@
<title-ref>inventorystatus</title-ref>
<title>Inventory Status</title>
<options>
<option id="unknown">unknown</option>
<option id="accessionstatusunclear">accession status unclear</option>
<option id="accessioned">accessioned</option>
<option id="deaccessioned">deaccessioned</option>
<option id="destroyed">destroyed</option>
<option id="destructiveanalysis">destructive analysis</option>
<option id="discarded">discarded</option>
<option id="exchanged">exchanged</option>
<option id="intendedfortransfer">intended for transfer</option>
<option id="irregularmuseumnumber">irregular museum number</option>
<option id="instorage">in storage</option>
<option id="missing">missing</option>
<option id="missingininventory">missing in inventory</option>
<option id="notcataloged">not cataloged</option>
<option id="notlocated">not located</option>
<option id="notreceived">not received</option>
<option id="numbernotused">number not used</option>
<option id="objectmount">object mount</option>
<option id="offsite">off site</option>
<option id="onloan">on loan</option>
<option id="partiallydeaccessioned">partially deaccessioned</option>
<option id="partiallyexchanged">partially exchanged</option>
<option id="partiallyrecataloged">partially recataloged</option>
<option id="preacquisition">pre acquisition</option>
<option id="retired">retired</option>
<option id="returnedloanobject">returned loan object</option>
<option id="sold">sold</option>
<option id="stolen">stolen</option>
<option id="transferred">transferred</option>
<option id="ondisplay">on display</option>
</options>
</instance>
<instance id="vocab-uocmethods">
Expand All @@ -58,7 +37,7 @@
<option id="researcher">researcher</option>
</options>
</instance>
<instance id="vocab-uocuserroles">
<instance id="vocab-uocuserroles">
<web-url>uocuserroles</web-url>
<title-ref>uocuserroles</title-ref>
<title>Use of Collections User Roles</title>
Expand Down Expand Up @@ -1571,4 +1550,15 @@
<option id="tribal_representative">tribal representative</option>
</options>
</instance>
<instance id="vocab-nagprainvolvedrole">
<web-url>nagprainvolvedrole</web-url>
<title-ref>nagprainvolvedrole</title-ref>
<title>NAGPRA Involved Role</title>
<options>
<option id="tribal_rep">tribal representative</option>
<option id="museum_rep">museum representative</option>
<option id="consultant">consultant</option>
<option id="lineal_descendant">lineal descendant</option>
</options>
</instance>
</instances>
27 changes: 3 additions & 24 deletions tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,12 @@
<title-ref>inventorystatus</title-ref>
<title>Inventory Status</title>
<options>
<option id="unknown">unknown</option>
<option id="accessionstatusunclear">accession status unclear</option>
<option id="accessioned">accessioned</option>
<option id="deaccessioned">deaccessioned</option>
<option id="destroyed">destroyed</option>
<option id="destructiveanalysis">destructive analysis</option>
<option id="discarded">discarded</option>
<option id="exchanged">exchanged</option>
<option id="intendedfortransfer">intended for transfer</option>
<option id="irregularmuseumnumber">irregular museum number</option>
<option id="instorage">in storage</option>
<option id="missing">missing</option>
<option id="missingininventory">missing in inventory</option>
<option id="notcataloged">not cataloged</option>
<option id="notlocated">not located</option>
<option id="notreceived">not received</option>
<option id="numbernotused">number not used</option>
<option id="objectmount">object mount</option>
<option id="offsite">off site</option>
<option id="onloan">on loan</option>
<option id="partiallydeaccessioned">partially deaccessioned</option>
<option id="partiallyexchanged">partially exchanged</option>
<option id="partiallyrecataloged">partially recataloged</option>
<option id="preacquisition">pre acquisition</option>
<option id="retired">retired</option>
<option id="returnedloanobject">returned loan object</option>
<option id="sold">sold</option>
<option id="stolen">stolen</option>
<option id="transferred">transferred</option>
<option id="ondisplay">on display</option>
</options>
</instance>
<instance id="vocab-uocmethods">
Expand Down
27 changes: 3 additions & 24 deletions tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,12 @@
<title-ref>inventorystatus</title-ref>
<title>Inventory Status</title>
<options>
<option id="unknown">unknown</option>
<option id="accessionstatusunclear">accession status unclear</option>
<option id="accessioned">accessioned</option>
<option id="deaccessioned">deaccessioned</option>
<option id="destroyed">destroyed</option>
<option id="destructiveanalysis">destructive analysis</option>
<option id="discarded">discarded</option>
<option id="exchanged">exchanged</option>
<option id="intendedfortransfer">intended for transfer</option>
<option id="irregularmuseumnumber">irregular museum number</option>
<option id="instorage">in storage</option>
<option id="missing">missing</option>
<option id="missingininventory">missing in inventory</option>
<option id="notcataloged">not cataloged</option>
<option id="notlocated">not located</option>
<option id="notreceived">not received</option>
<option id="numbernotused">number not used</option>
<option id="objectmount">object mount</option>
<option id="offsite">off site</option>
<option id="onloan">on loan</option>
<option id="partiallydeaccessioned">partially deaccessioned</option>
<option id="partiallyexchanged">partially exchanged</option>
<option id="partiallyrecataloged">partially recataloged</option>
<option id="preacquisition">pre acquisition</option>
<option id="retired">retired</option>
<option id="returnedloanobject">returned loan object</option>
<option id="sold">sold</option>
<option id="stolen">stolen</option>
<option id="transferred">transferred</option>
<option id="ondisplay">on display</option>
</options>
</instance>
<instance id="vocab-uocmethods">
Expand Down