From 01b0a62c57d553d79b4aba0ce48236bf3e6c83b8 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 7 Jul 2009 09:27:15 +0000
Subject: [PATCH] BaseAddress
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Erste Version fertig. Scheint soweit alles zu funktionieren. Die Auswahlbox für die Landesauswahl ist nun auch endlich alphabetisch sortiert nach den Ländernamen und nicht nach ISO-Code.

Bitte testen.

git-svn-id: https://svn.libreccm.org/ccm/trunk@207 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/contenttypes/ui/BaseAddressPropertiesStep.java    | 8 ++++----
 .../cms/contenttypes/ui/BaseAddressPropertyForm.java      | 2 +-
 .../com/arsdigita/cms/contenttypes/BaseAddress.xsl        | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertiesStep.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertiesStep.java
index 0b8cc25f4..03a65e8a6 100644
--- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertiesStep.java
+++ b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertiesStep.java
@@ -55,7 +55,7 @@ public class BaseAddressPropertiesStep extends SimpleEditStep {
 
     public static Component getBaseAddressPropertySheet(ItemSelectionModel itemModel) {
 	DomainObjectPropertySheet sheet = new DomainObjectPropertySheet(itemModel);
-
+        
         sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.name").localize(), BaseAddress.NAME);
         sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.title").localize(), BaseAddress.TITLE);
 	sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.address").localize(), BaseAddress.ADDRESS);
@@ -63,14 +63,14 @@ public class BaseAddressPropertiesStep extends SimpleEditStep {
 	sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.city").localize(), BaseAddress.CITY);
 	sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.state").localize(), BaseAddress.STATE);
 
-        sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.country").localize(), 
+        sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.iso_country_code").localize(), 
                 BaseAddress.ISO_COUNTRY_CODE,
                 new DomainObjectPropertySheet.AttributeFormatter() {
                    public String format(DomainObject item,
                                         String attribute,
                                         PageState state) {
                       BaseAddress baseAddress = (BaseAddress)item;
-                      if(baseAddress.getIsoCountryCode() != null) {
+                      if(baseAddress != null && baseAddress.getIsoCountryCode() != null) {
                           return BaseAddress.getCountryNameFromIsoCode(baseAddress.getIsoCountryCode());
                       } else {
                           return (String)BaseAddressGlobalizationUtil.globalize
@@ -78,7 +78,7 @@ public class BaseAddressPropertiesStep extends SimpleEditStep {
                       }
                    }
                 }
-       );
+        );
 	
 	if(!ContentSection.getConfig().getHideLaunchDate()) {
 	    sheet.add((String)BaseAddressGlobalizationUtil.globalize("cms.ui.authoring.page_launch_date").localize(),
diff --git a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertyForm.java b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertyForm.java
index 745fe1728..80da134d5 100644
--- a/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertyForm.java
+++ b/ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertyForm.java
@@ -103,7 +103,7 @@ public class BaseAddressPropertyForm extends BasicPageForm implements FormProces
 	add(state);
         
         if (!BaseAddress.getConfig().getHideCountryCodeSelection()) {
-            add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.country").localize()));
+            add(new Label((String)BaseAddressGlobalizationUtil.globalize("cms.contenttypes.ui.baseAddress.iso_country_code").localize()));
             ParameterModel countryParam = new StringParameter(ISO_COUNTRY_CODE);
             countryParam.addParameterListener(new StringInRangeValidationListener(0, 2));
             
diff --git a/ccm-cms-types-baseAddress/web/static/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xsl b/ccm-cms-types-baseAddress/web/static/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xsl
index d4fe25a8b..2215c9856 100644
--- a/ccm-cms-types-baseAddress/web/static/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xsl
+++ b/ccm-cms-types-baseAddress/web/static/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xsl
@@ -38,7 +38,7 @@
             <xsl:if test="./isoCountryCode/countryName">
               <tr>
                 <th>Country:</th>
-                <td class="contentText" valign="top" align="left"><xsl:value-of select="./isoCountryCode/countryName"/></td>
+                <td class="contentText" valign="top" align="left"><xsl:value-of select="./country"/></td>
               </tr>
             </xsl:if>
           </table>