Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3029] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2010-09-10 14:46:29
|
Revision: 3029
http://openutils.svn.sourceforge.net/openutils/?rev=3029&view=rev
Author: diego_schivo
Date: 2010-09-10 14:46:23 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-177 config
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:35:10 UTC (rev 3028)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2010-09-10 14:46:23 UTC (rev 3029)
@@ -23,7 +23,9 @@
import info.magnolia.module.ModuleLifecycleContext;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import net.sourceforge.openutils.mgnlmedia.media.advancedsearch.configuration.SearchMediaQueryConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.configuration.ImageProcessorsManager;
@@ -65,6 +67,8 @@
private int folderViewItemsPerPage;
+ private Map<String, Integer> folderViewPageSizes = new HashMap<String, Integer>();
+
private ZipImporter zipimporter;
private List playlistTrackExtensionContributors = new ArrayList();
@@ -190,6 +194,24 @@
}
/**
+ * Returns the folderViewPageSizes.
+ * @return the folderViewPageSizes
+ */
+ public Map<String, Integer> getFolderViewPageSizes()
+ {
+ return folderViewPageSizes;
+ }
+
+ /**
+ * @param sizeKey
+ * @param value
+ */
+ public void addFolderViewPageSizes(String sizeKey, Long value)
+ {
+ folderViewPageSizes.put(sizeKey, value.intValue());
+ }
+
+ /**
* Returns the zipimporter.
* @return the zipimporter
*/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:35:10 UTC (rev 3028)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:46:23 UTC (rev 3029)
@@ -253,14 +253,13 @@
}
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
- return MediaEl.module().getSearch().search(
- request,
- type,
- path,
- false,
- sorting,
- MediaEl.module().getFolderViewItemsPerPage(),
- page);
+ MediaModule module = MediaEl.module();
+ Integer itemsPerPage = module.getFolderViewPageSizes().get(pagesizeSelector);
+ if (itemsPerPage == null)
+ {
+ itemsPerPage = module.getFolderViewItemsPerPage();
+ }
+ return module.getSearch().search(request, type, path, false, sorting, module.getFolderViewItemsPerPage(), page);
}
/**
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml 2010-09-10 14:46:23 UTC (rev 3029)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="folderViewPageSizes" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7a61d6f0-b42c-48bf-8772-9e217656e55e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="size1" sv:type="Long">
+ <sv:value>10</sv:value>
+ </sv:property>
+ <sv:property sv:name="size2" sv:type="Long">
+ <sv:value>25</sv:value>
+ </sv:property>
+ <sv:property sv:name="size3" sv:type="Long">
+ <sv:value>50</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-09-10T16:39:29.243+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-09-10T16:44:23.579+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.folderViewPageSizes.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
