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

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
master
jensp 2014-11-14 15:26:43 +00:00
parent 00d473158b
commit 627dfd8206
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ccm-cms-types-mparticle/src/com/arsdigita/cms/contenttypes/ArticleSectionXMLGenerator.java
View File

@ -57,9 +57,13 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator {
for (int i = 0; i < sections.length; i++) { for (int i = 0; i < sections.length; i++) {
generateSectionXML(state, content, sections[i], xmlGenerator); generateSectionXML(state, content, sections[i], xmlGenerator);
} }
final PageNumber number = getPageNumber(state); 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) { public void addGlobalStateParams(final Page page) {
@ -81,7 +85,7 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator {
if (number == null) { if (number == null) {
number = new PageNumber("1"); number = new PageNumber("1");
} }
return number; return number;
} }
@ -118,7 +122,7 @@ public class ArticleSectionXMLGenerator implements ExtraXMLGenerator {
// if (number == null) { // if (number == null) {
// number = new PageNumber("1"); // number = new PageNumber("1");
// } // }
final PageNumber number = getPageNumber(state); final PageNumber number = getPageNumber(state);
MultiPartArticle mpa = (MultiPartArticle) item; MultiPartArticle mpa = (MultiPartArticle) item;