[Aplaws-commit] r2411 - in releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes: . ui

[<pb...@fe...>]

Author: pboy
Date: 2012-12-17 13:19:48 +0000 (Mon, 17 Dec 2012)
New Revision: 2411

Modified:
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContact.java
   releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
Log:
Backport r2408  (on behalf of JensP)

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContact.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContact.java	2012-12-17 13:07:53 UTC (rev 2410)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContact.java	2012-12-17 13:19:48 UTC (rev 2411)
@@ -301,6 +301,31 @@
 
     @Override
     public void generateXML(ContentItem item, Element element, PageState state) {
+        if (getPerson() != null) {
+            Element personElem = element.newChildElement("person");
+            GenericPerson person = getPerson();
+
+            if ((person.getSurname() != null) && !person.getSurname().isEmpty()) {
+                Element surnameElem = personElem.newChildElement("surname");
+                surnameElem.setText(person.getSurname());
+            }
+
+            if ((person.getGivenName() != null) && !person.getGivenName().isEmpty()) {
+                Element givenNameElem = personElem.newChildElement("givenname");
+                givenNameElem.setText(person.getGivenName());
+            }
+
+            if ((person.getTitlePre() != null) && !person.getTitlePre().isEmpty()) {
+                Element titlePreElem = personElem.newChildElement("titlepre");
+                titlePreElem.setText(person.getTitlePre());
+            }
+
+            if ((person.getTitlePost() != null) && !person.getTitlePost().isEmpty()) {
+                Element titlePostElem = personElem.newChildElement("titlepost");
+                titlePostElem.setText(person.getTitlePost());
+            }
+        }
+        
         StringTokenizer keys = s_config.getContactEntryKeys();
         
         Element contactKeysElem = element.newChildElement("contactEntryKeys");        

Modified: releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
===================================================================
--- releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java	2012-12-17 13:07:53 UTC (rev 2410)
+++ releases/2.0.0/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java	2012-12-17 13:19:48 UTC (rev 2411)
@@ -81,7 +81,7 @@
                 findByAssociatedObjectType(getPersonType()));
         /*m_itemSearch.getItemField().addValidationListener(
         new NotNullValidationListener());*/
-        m_itemSearch.setDisableCreatePane(true);
+        m_itemSearch.setDisableCreatePane(false);
         add(this.m_itemSearch);
 
         selectedPersonNameLabel = new Label("");