From 89a2dbfb87b76981dc1ab556c1fd24c327b0e403 Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Thu, 25 Sep 2014 17:58:23 -0700 Subject: [PATCH] CSPACE-6420: Allow initialization, via App layer configuration, of descriptions for vocabulary terms in dynamic vocabularies. --- .../main/java/org/collectionspace/chain/csp/schema/Spec.java | 2 +- .../src/main/resources/defaults/base-instance-vocabularies.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Spec.java b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Spec.java index 218e698548..b58992f02f 100644 --- a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Spec.java +++ b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Spec.java @@ -248,7 +248,7 @@ public Object populate(Object parent, ReadOnlySection section) { boolean dfault=false; String value=(String)section.getValue("/@default"); dfault=(value!=null && ("yes".equals(value.toLowerCase()) || "1".equals(value.toLowerCase()))); - n.addOption((String)section.getValue("/@id"),(String)section.getValue(""),(String)section.getValue("/@sample"),dfault); + n.addOption((String)section.getValue("/@id"),(String)section.getValue(""),(String)section.getValue("/@sample"),dfault,(String)section.getValue("/@desc")); return n; } }); 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 4853822067..6001d0b7e1 100644 --- a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml @@ -11,7 +11,7 @@ Languages - +