From 627dfd8206af4dbea6ec568640367da59bc5a109 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 14 Nov 2014 15:26:43 +0000 Subject: [PATCH] Another Bugfix for the MPA which I found while working on Foundry: The value "all" for the page parameters works now. If a MPA is called with ?page=all all sections of the MPA are shown. git-svn-id: https://svn.libreccm.org/ccm/trunk@2969 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/ArticleSectionXMLGenerator.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionXMLGenerator.java b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionXMLGenerator.java index 8651bb956..1100c17e9 100644 --- a/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionXMLGenerator.java +++ b/ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionXMLGenerator.java @@ -57,9 +57,13 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator { for (int i = 0; i < sections.length; i++) { generateSectionXML(state, content, sections[i], xmlGenerator); } - + final PageNumber number = getPageNumber(state); - content.addAttribute("pageNumber", number.getPageNumber().toString()); + if (number.wantAllSections()) { + content.addAttribute("pageNumber", "all"); + } else { + content.addAttribute("pageNumber", number.getPageNumber().toString()); + } } public void addGlobalStateParams(final Page page) { @@ -81,7 +85,7 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator { if (number == null) { number = new PageNumber("1"); } - + return number; } @@ -118,7 +122,7 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator { // if (number == null) { // number = new PageNumber("1"); // } - + final PageNumber number = getPageNumber(state); MultiPartArticle mpa = (MultiPartArticle) item;