CSPACE-2138: Changed 'status' field to 'termStatus' in Person schema, in the services...

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
index 62124045bbd6bcda33d8f2f3ad83b89873f653f7..108e3fad5dabeea682fb5463afc93681b23f7668 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -85,7 +85,7 @@
         <row><widget>schoolOrStyle</widget></row>
         <row><widget>bioNote</widget></row>
         <row><widget>nameNote</widget></row>
-        <row><widget>status</widget></row>
+        <row><widget>termStatus</widget></row>
       </rows>
 
       <widget name="displayName" type="text">
@@ -361,13 +361,13 @@
         </properties>
       </widget>
 
-      <widget name="status" type="text">
+      <widget name="termStatus" type="text">
         <labels>
-          <label mode="any">status</label>
+          <label mode="any">termStatus</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="persons_common">status</field>
+          <field schema="persons_common">termStatus</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>

diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
index 4cfad2e5cf45805d63393cc4e7720d5d42313031..d1f733f1bbca87c280f17dd3d2533e3a0d7a8c51 100644 (file)
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
@@ -44,7 +44,7 @@
     <xs:element name="schoolOrStyle" type="xs:string"/>
     <xs:element name="bioNote" type="xs:string"/>
     <xs:element name="nameNote" type="xs:string"/>
-    <xs:element name="status" type="xs:string"/>
+    <xs:element name="termStatus" type="xs:string"/>
 
 </xs:schema>
 

diff --git a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
index e52c7dafc5a5c43bd9dfcba32c6f0994b6600f10..c9e1f54ede8fbf2ef76ffa034e67bbc9593e1e47 100644 (file)
--- a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
+++ b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonJAXBSchema.java
@@ -32,6 +32,6 @@ public interface PersonJAXBSchema {
        final static String SCHOOL_OR_STYLE = "schoolOrStyle";\r
        final static String BIO_NOTE = "bioNote";\r
        final static String NAME_NOTE = "nameNote";\r
-        final static String STATUS = "status";\r
+    final static String TERM_STATUS = "termStatus";\r
 }\r
 \r

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index fc08f81d5e8b2fd123f5fd1b0eb2b516609205dd..4294cef9c0077d07f0120a85d29d554ba83b5d73 100644 (file)
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -54,7 +54,7 @@
                 <xs:element name="schoolOrStyle" type="xs:string"/>
                 <xs:element name="bioNote" type="xs:string"/>
                 <xs:element name="nameNote" type="xs:string"/>
-                <xs:element name="status" type="xs:string"/>
+                <xs:element name="termStatus" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>