From fe73f2b673bad79bdd2aa6787013b5d8cfff7910 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 8 Feb 2010 18:13:21 +0000
Subject: [PATCH] CSPACE-949: Fixed bug in Nuxeo layouts-contrib.xml file. 
 Also, added placeholders for boolean flag for indicating whether or not there
 is a computed display name that should be used instead of the default
 displayName.

---
 .../resources/OSGI-INF/layouts-contrib.xml    | 16 ++++++++-
 .../schemas/organizations_common.xsd          |  1 +
 .../main/resources/organization_common.xsd    | 33 +++++++++----------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
index ca5555761..7c7c37c0c 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -65,6 +65,7 @@
       </templates>
       <rows>
         <row><widget>displayName</widget></row>
+<!--        <row><widget>displayNameComputed</widget></row> -->
         <row><widget>shortName</widget></row>
         <row><widget>refName</widget></row>
         <row><widget>inAuthority</widget></row>
@@ -84,13 +85,26 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="orgauthorities_common">displayName</field>
+          <field schema="organizations_common">displayName</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
       
+<!--      <widget name="displayNameComputed" type="text">
+        <labels>
+          <label mode="any">Display Name Computed?</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field schema="organizations_common">displayNameComputed</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget> -->
+      
       <widget name="shortName" type="text">
         <labels>
           <label mode="any">ShortName</label>
diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
index f66283d5d..3b72e2d25 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
@@ -25,6 +25,7 @@
 		<xs:element name="inAuthority" type="xs:string" />
 		<xs:element name="refName" type="xs:string"/>
 		<xs:element name="displayName" type="xs:string"/>
+<!--		<xs:element name="displayNameComputed" type="xs:boolean"/> -->
 		<xs:element name="shortName" type="xs:string"/>
 		<xs:element name="longName" type="xs:string"/>
 		<xs:element name="nameAdditions" type="xs:string"/>
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index b12ba3622..d06746162 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/organization"
-  xmlns="http://collectionspace.org/services/organization"
-  targetNamespace="http://collectionspace.org/services/organization"
-  version="0.1"
->
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:ns="http://collectionspace.org/services/organization"
+    xmlns="http://collectionspace.org/services/organization"
+    targetNamespace="http://collectionspace.org/services/organization"
+    version="0.1"
+    >
 
-
-<!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
-<!-- See http://wiki.collectionspace.org/display/collectionspace/Organization+Service+Home -->    
+    <!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+    <!-- See http://wiki.collectionspace.org/display/collectionspace/Organization+Service+Home -->    
     
     <!-- Organization -->
     <xs:element name="organizations_common">
         <xs:complexType>
             <xs:sequence>
                 <!--  Common identifier -->
-                <xs:element name="csid" type="xs:string" />
-                
+                <xs:element name="csid" type="xs:string" />			        
                 <!--  Organization Information Group -->
                 <xs:element name="inAuthority" type="xs:string" />
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="displayName" type="xs:string"/>
+<!--			        <xs:element name="displayNameComputed" type="xs:boolean"/> -->
                 <xs:element name="shortName" type="xs:string"/>
                 <xs:element name="longName" type="xs:string"/>
-				<xs:element name="nameAdditions" type="xs:string"/>
-				<xs:element name="contactName" type="xs:string"/>
-				<xs:element name="foundingDate" type="xs:string"/>
-				<xs:element name="dissolutionDate" type="xs:string"/>
-				<xs:element name="foundingPlace" type="xs:string"/>
-				<xs:element name="function" type="xs:string"/>
+                <xs:element name="nameAdditions" type="xs:string"/>
+                <xs:element name="contactName" type="xs:string"/>
+                <xs:element name="foundingDate" type="xs:string"/>
+                <xs:element name="dissolutionDate" type="xs:string"/>
+                <xs:element name="foundingPlace" type="xs:string"/>
+                <xs:element name="function" type="xs:string"/>
                 <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
-- 
2.47.3