Skip to content

Commit d6c78f5

Browse files
mikejrittermikejritter
authored
Merge pull request #341 from collectionspace/develop
Merge Release 8.3.0-RC.2
2 parents fe12a9f + 52f18fc commit d6c78f5

10 files changed

Lines changed: 77 additions & 105 deletions

‎CHANGELOG.md‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,25 @@
1010

1111
### Procedures
1212

13-
#### CollectionObject
13+
#### Acquisition
14+
15+
* Add free text field `acquisitionDescription`
16+
* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup`
17+
18+
#### Consultation
19+
20+
* Add repeatable field `consultationOutcomes/consultationOutcome`
21+
22+
#### Deaccession
23+
24+
* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup`
25+
26+
### CollectionObject
1427

1528
* **Anthro** Add material/technique description free text field
29+
* Add repeating autocomplete field `controlledContentPlaces/controlledContentPlace`
1630

17-
#### Media
31+
### Media
1832

1933
* Add `mini="list"` to alt text
2034

@@ -26,9 +40,21 @@
2640

2741
* Update default terms to catalog note, legacy data note, and staff note
2842

43+
#### Inventory Status
44+
45+
**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials**
46+
47+
* Update default terms to deaccessions, in storage, missing, off site, on loan, and on display
48+
49+
#### NAGPRA Involved Role
50+
51+
**FCART**
52+
53+
* Added existing default terms to profile
54+
2955
#### Organization Types
3056

31-
**Core, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials**
57+
**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials**
3258

3359
* Add federally-recognized tribe and non-federally-recognized tribe to default terms
3460

@@ -39,7 +65,7 @@
3965

4066
## 8.2.0
4167

42-
## Procedures
68+
### Procedures
4369

4470
### CollectionObject
4571

@@ -61,12 +87,12 @@
6187

6288
* Add field `note`
6389

64-
## Profiles
90+
### Profiles
6591

66-
### Anthro
92+
#### Anthro
6793

6894
* Remove `anthroOwnershipAccess` from `CollectionObject`
6995

70-
### FCART
96+
#### FCART
7197

7298
* Add `deaccessionreason` term list to fcart profile instance vocabularies

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<name>Root</name>
1010

1111
<properties>
12-
<revision>8.3.0-RC.1</revision>
12+
<revision>8.3.0-RC.2</revision>
1313
<cspace.services.version>${revision}</cspace.services.version>
1414
<temp.war.location>${basedir}/tmp</temp.war.location>
1515
<cspace.tool.csmake>csmake</cspace.tool.csmake>

‎tomcat-main/src/main/resources/defaults/base-collectionobject.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@
254254
<repeat id="contentPersons">
255255
<field id="contentPerson" autocomplete="true" />
256256
</repeat>
257+
<repeat id="controlledContentPlaces">
258+
<field id="controlledContentPlace" autocomplete="true" />
259+
</repeat>
257260
<repeat id="contentPlaces">
258261
<field id="contentPlace" />
259262
</repeat>

‎tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,12 @@
55
<title-ref>inventorystatus</title-ref>
66
<title>Inventory Status</title>
77
<options>
8-
<option id="unknown">unknown</option>
9-
<option id="accessionstatusunclear">accession status unclear</option>
10-
<option id="accessioned">accessioned</option>
118
<option id="deaccessioned">deaccessioned</option>
12-
<option id="destroyed">destroyed</option>
13-
<option id="destructiveanalysis">destructive analysis</option>
14-
<option id="discarded">discarded</option>
15-
<option id="exchanged">exchanged</option>
16-
<option id="intendedfortransfer">intended for transfer</option>
17-
<option id="irregularmuseumnumber">irregular museum number</option>
9+
<option id="instorage">in storage</option>
1810
<option id="missing">missing</option>
19-
<option id="missingininventory">missing in inventory</option>
20-
<option id="notcataloged">not cataloged</option>
21-
<option id="notlocated">not located</option>
22-
<option id="notreceived">not received</option>
23-
<option id="numbernotused">number not used</option>
24-
<option id="objectmount">object mount</option>
11+
<option id="offsite">off site</option>
2512
<option id="onloan">on loan</option>
26-
<option id="partiallydeaccessioned">partially deaccessioned</option>
27-
<option id="partiallyexchanged">partially exchanged</option>
28-
<option id="partiallyrecataloged">partially recataloged</option>
29-
<option id="preacquisition">pre acquisition</option>
30-
<option id="retired">retired</option>
31-
<option id="returnedloanobject">returned loan object</option>
32-
<option id="sold">sold</option>
33-
<option id="stolen">stolen</option>
34-
<option id="transferred">transferred</option>
13+
<option id="ondisplay">on display</option>
3514
</options>
3615
</instance>
3716
<instance id="vocab-uocmethods">

‎tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<field id="objectPurchaseOfferPriceValue" datatype="float" />
5151
<field id="originalObjectPurchasePriceCurrency" autocomplete="true" ui-type="enum" />
5252
<field id="originalObjectPurchasePriceValue" datatype="float" />
53+
<field id="acquisitionDescription" />
5354
<field id="acquisitionReason" />
5455
<field id="acquisitionNote" />
5556
<field id="acquisitionProvisos" />
@@ -59,6 +60,11 @@
5960
<field id="acquisitionFundingSource" autocomplete="true" />
6061
<field id="acquisitionFundingSourceProvisos" />
6162
</repeat>
63+
<repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
64+
<field id="involvedParty" autocomplete="true" />
65+
<field id="involvedOnBehalfOf" autocomplete="true" />
66+
<field id="involvedRole" autocomplete="true" ui-type="enum" />
67+
</repeat>
6268
</section>
6369
<section id="objectCollectionInformation">
6470
<repeat id="fieldCollectionEventNames">

‎tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<field id="consultDate" datatype="date" />
3636
<field id="consultNote" />
3737
</repeat>
38+
39+
<repeat id="consultationOutcomes">
40+
<field id="consultationOutcome" />
41+
</repeat>
3842
</section>
3943

4044
</record>

‎tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<repeat id="exitMethods">
3737
<field id="exitMethod" autocomplete="true" ui-type="enum" />
3838
</repeat>
39+
40+
<repeat id="partiesInvolvedGroupList/partiesInvolvedGroup">
41+
<field id="involvedParty" autocomplete="true" />
42+
<field id="involvedOnBehalfOf" autocomplete="true" />
43+
<field id="involvedRole" autocomplete="true" ui-type="enum" />
44+
</repeat>
3945
</section>
4046

4147
</record>

‎tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,12 @@
55
<title-ref>inventorystatus</title-ref>
66
<title>Inventory Status</title>
77
<options>
8-
<option id="unknown">unknown</option>
9-
<option id="accessionstatusunclear">accession status unclear</option>
10-
<option id="accessioned">accessioned</option>
118
<option id="deaccessioned">deaccessioned</option>
12-
<option id="destroyed">destroyed</option>
13-
<option id="destructiveanalysis">destructive analysis</option>
14-
<option id="discarded">discarded</option>
15-
<option id="exchanged">exchanged</option>
16-
<option id="intendedfortransfer">intended for transfer</option>
17-
<option id="irregularmuseumnumber">irregular museum number</option>
9+
<option id="instorage">in storage</option>
1810
<option id="missing">missing</option>
19-
<option id="missingininventory">missing in inventory</option>
20-
<option id="notcataloged">not cataloged</option>
21-
<option id="notlocated">not located</option>
22-
<option id="notreceived">not received</option>
23-
<option id="numbernotused">number not used</option>
24-
<option id="objectmount">object mount</option>
11+
<option id="offsite">off site</option>
2512
<option id="onloan">on loan</option>
26-
<option id="partiallydeaccessioned">partially deaccessioned</option>
27-
<option id="partiallyexchanged">partially exchanged</option>
28-
<option id="partiallyrecataloged">partially recataloged</option>
29-
<option id="preacquisition">pre acquisition</option>
30-
<option id="retired">retired</option>
31-
<option id="returnedloanobject">returned loan object</option>
32-
<option id="sold">sold</option>
33-
<option id="stolen">stolen</option>
34-
<option id="transferred">transferred</option>
13+
<option id="ondisplay">on display</option>
3514
</options>
3615
</instance>
3716
<instance id="vocab-uocmethods">
@@ -58,7 +37,7 @@
5837
<option id="researcher">researcher</option>
5938
</options>
6039
</instance>
61-
<instance id="vocab-uocuserroles">
40+
<instance id="vocab-uocuserroles">
6241
<web-url>uocuserroles</web-url>
6342
<title-ref>uocuserroles</title-ref>
6443
<title>Use of Collections User Roles</title>
@@ -1571,4 +1550,15 @@
15711550
<option id="tribal_representative">tribal representative</option>
15721551
</options>
15731552
</instance>
1553+
<instance id="vocab-nagprainvolvedrole">
1554+
<web-url>nagprainvolvedrole</web-url>
1555+
<title-ref>nagprainvolvedrole</title-ref>
1556+
<title>NAGPRA Involved Role</title>
1557+
<options>
1558+
<option id="tribal_rep">tribal representative</option>
1559+
<option id="museum_rep">museum representative</option>
1560+
<option id="consultant">consultant</option>
1561+
<option id="lineal_descendant">lineal descendant</option>
1562+
</options>
1563+
</instance>
15741564
</instances>

‎tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,12 @@
77
<title-ref>inventorystatus</title-ref>
88
<title>Inventory Status</title>
99
<options>
10-
<option id="unknown">unknown</option>
11-
<option id="accessionstatusunclear">accession status unclear</option>
12-
<option id="accessioned">accessioned</option>
1310
<option id="deaccessioned">deaccessioned</option>
14-
<option id="destroyed">destroyed</option>
15-
<option id="destructiveanalysis">destructive analysis</option>
16-
<option id="discarded">discarded</option>
17-
<option id="exchanged">exchanged</option>
18-
<option id="intendedfortransfer">intended for transfer</option>
19-
<option id="irregularmuseumnumber">irregular museum number</option>
11+
<option id="instorage">in storage</option>
2012
<option id="missing">missing</option>
21-
<option id="missingininventory">missing in inventory</option>
22-
<option id="notcataloged">not cataloged</option>
23-
<option id="notlocated">not located</option>
24-
<option id="notreceived">not received</option>
25-
<option id="numbernotused">number not used</option>
26-
<option id="objectmount">object mount</option>
13+
<option id="offsite">off site</option>
2714
<option id="onloan">on loan</option>
28-
<option id="partiallydeaccessioned">partially deaccessioned</option>
29-
<option id="partiallyexchanged">partially exchanged</option>
30-
<option id="partiallyrecataloged">partially recataloged</option>
31-
<option id="preacquisition">pre acquisition</option>
32-
<option id="retired">retired</option>
33-
<option id="returnedloanobject">returned loan object</option>
34-
<option id="sold">sold</option>
35-
<option id="stolen">stolen</option>
36-
<option id="transferred">transferred</option>
15+
<option id="ondisplay">on display</option>
3716
</options>
3817
</instance>
3918
<instance id="vocab-uocmethods">

‎tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,12 @@
77
<title-ref>inventorystatus</title-ref>
88
<title>Inventory Status</title>
99
<options>
10-
<option id="unknown">unknown</option>
11-
<option id="accessionstatusunclear">accession status unclear</option>
12-
<option id="accessioned">accessioned</option>
1310
<option id="deaccessioned">deaccessioned</option>
14-
<option id="destroyed">destroyed</option>
15-
<option id="destructiveanalysis">destructive analysis</option>
16-
<option id="discarded">discarded</option>
17-
<option id="exchanged">exchanged</option>
18-
<option id="intendedfortransfer">intended for transfer</option>
19-
<option id="irregularmuseumnumber">irregular museum number</option>
11+
<option id="instorage">in storage</option>
2012
<option id="missing">missing</option>
21-
<option id="missingininventory">missing in inventory</option>
22-
<option id="notcataloged">not cataloged</option>
23-
<option id="notlocated">not located</option>
24-
<option id="notreceived">not received</option>
25-
<option id="numbernotused">number not used</option>
26-
<option id="objectmount">object mount</option>
13+
<option id="offsite">off site</option>
2714
<option id="onloan">on loan</option>
28-
<option id="partiallydeaccessioned">partially deaccessioned</option>
29-
<option id="partiallyexchanged">partially exchanged</option>
30-
<option id="partiallyrecataloged">partially recataloged</option>
31-
<option id="preacquisition">pre acquisition</option>
32-
<option id="retired">retired</option>
33-
<option id="returnedloanobject">returned loan object</option>
34-
<option id="sold">sold</option>
35-
<option id="stolen">stolen</option>
36-
<option id="transferred">transferred</option>
15+
<option id="ondisplay">on display</option>
3716
</options>
3817
</instance>
3918
<instance id="vocab-uocmethods">

0 commit comments

Comments
 (0)