From 5b735f5dd694ece8594b2071cc3b9dd6c74ca5de Mon Sep 17 00:00:00 2001 From: pb Date: Fri, 15 Feb 2008 18:16:09 +0000 Subject: [PATCH] incorporating APLAWS patch: r1653 | chrisg23 | 2007-09-18 12:58:34 +0200 (Di, 18 Sep 2007) Small bugfix - if you have com.arsdigita.cms.types.mparticle.search.result_format=page_top then one page mparticles may have the word null added to the end of the title. This fixes the problem ------------------------------------------------------------------------ r1654 | chrisg23 | 2007-09-18 13:11:32 +0200 (Di, 18 Sep 2007) Sourceforge patch 1796980 - check with cms config parameter when deciding whether summary is mandatory in multipart article git-svn-id: https://svn.libreccm.org/ccm/trunk@24 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ArticleSectionMetadataProvider.java | 5 ++--- .../cms/contenttypes/ui/mparticle/MultiPartArticleForm.java | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionMetadataProvider.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionMetadataProvider.java index 51232685f..4e290c81d 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionMetadataProvider.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionMetadataProvider.java @@ -20,10 +20,8 @@ package com.arsdigita.cms.contenttypes; import org.apache.log4j.Logger; -import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.search.ContentPageMetadataProvider; import com.arsdigita.domain.DomainObject; -import com.arsdigita.util.StringUtils; /** * This class is an implementation of the Search metadata provider that @@ -51,8 +49,9 @@ extends ContentPageMetadataProvider { title.append(": "); } } + if (pageTitle != null) { title.append(pageTitle); - + } return title.toString(); } diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleForm.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleForm.java index 220a5e105..1147d25a8 100755 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleForm.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ui/mparticle/MultiPartArticleForm.java @@ -152,7 +152,9 @@ public abstract class MultiPartArticleForm extends FormSection add(new Label(MPArticleGlobalizationUtil.globalize("cms.contenttypes.ui.mparticle.summary"))); TextArea summaryWidget = new TextArea(new TrimmedStringParameter(SUMMARY)); - summaryWidget.addValidationListener(new NotNullValidationListener()); + if (ContentSection.getConfig().mandatoryDescriptions()) { + summaryWidget.addValidationListener(new NotEmptyValidationListener(GlobalizationUtil.globalize("cms.contenttypes.ui.description_missing"))); + } summaryWidget.setRows(5); summaryWidget.setCols(30); add(summaryWidget);