Author: fpunt
Date: 2010-05-19 10:02:08 +0200 (Wed, 19 May 2010)
New Revision: 42239
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
Log:
attempt to fix CMSC-1693
Modified:
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-18 17:14:26 UTC (rev 42238)
+++
CMSContainer/trunk/CMSContainer/cmsc/portlets/src/java/com/finalist/cmsc/portlets/ContentChannelPortlet.java
2010-05-19 08:02:08 UTC (rev 42239)
@@ -133,8 +133,19 @@
}
}
+
- protected void addContentElements(RenderRequest req, String channel) {
+ @Override
+ public void processEditDefaults(ActionRequest request, ActionResponse
response) throws PortletException, IOException {
+ super.processEditDefaults(request, response);
+
+ if(request.getAttribute(MAX_ELEMENTS) == null) {
+ request.setAttribute(MAX_ELEMENTS,
DEFAULT_MAX_ELEMENTS);
+ }
+ }
+
+
+ protected void addContentElements(RenderRequest req, String channel) {
String elementId = req.getParameter(ELEMENT_ID);
if (StringUtils.isEmpty(elementId)) {
PortletPreferences preferences = req.getPreferences();
@@ -167,7 +178,6 @@
int maxElements = Integer.parseInt(preferences.getValue(MAX_ELEMENTS,
"-1"));
if (maxElements <= 0) {
maxElements = DEFAULT_MAX_ELEMENTS;
- req.setAttribute(MAX_ELEMENTS, DEFAULT_MAX_ELEMENTS);
}
int elementsPerPage =
Integer.parseInt(preferences.getValue(ELEMENTS_PER_PAGE, "-1"));
if (elementsPerPage <= 0) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
