LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BaseAddress 

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
master
quasi 2009-07-07 09:27:15 +00:00
parent c084e9a837
commit 01b0a62c57
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertiesStep.java
View File

@ -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.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.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, BaseAddress.ISO_COUNTRY_CODE,
new DomainObjectPropertySheet.AttributeFormatter() { new DomainObjectPropertySheet.AttributeFormatter() {
public String format(DomainObject item, public String format(DomainObject item,
String attribute, String attribute,
PageState state) { PageState state) {
BaseAddress baseAddress = (BaseAddress)item; BaseAddress baseAddress = (BaseAddress)item;
if(baseAddress.getIsoCountryCode() != null) { if(baseAddress != null && baseAddress.getIsoCountryCode() != null) {
return BaseAddress.getCountryNameFromIsoCode(baseAddress.getIsoCountryCode()); return BaseAddress.getCountryNameFromIsoCode(baseAddress.getIsoCountryCode());
} else { } else {
return (String)BaseAddressGlobalizationUtil.globalize return (String)BaseAddressGlobalizationUtil.globalize

2
ccm-cms-types-baseAddress/src/com/arsdigita/cms/contenttypes/ui/BaseAddressPropertyForm.java
View File

@ -103,7 +103,7 @@ public class BaseAddressPropertyForm extends BasicPageForm implements FormProces
add(state); add(state);
if (!BaseAddress.getConfig().getHideCountryCodeSelection()) { 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); ParameterModel countryParam = new StringParameter(ISO_COUNTRY_CODE);
countryParam.addParameterListener(new StringInRangeValidationListener(0, 2)); countryParam.addParameterListener(new StringInRangeValidationListener(0, 2));

2
ccm-cms-types-baseAddress/web/static/content-types/com/arsdigita/cms/contenttypes/BaseAddress.xsl
View File

@ -38,7 +38,7 @@
<xsl:if test="./isoCountryCode/countryName"> <xsl:if test="./isoCountryCode/countryName">
<tr> <tr>
<th>Country:</th> <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> </tr>
</xsl:if> </xsl:if>
</table> </table>