Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2882] trunk
|
From: <die...@us...> - 2010-08-25 07:11:36
|
Revision: 2882
http://openutils.svn.sourceforge.net/openutils/?rev=2882&view=rev
Author: diego_schivo
Date: 2010-08-25 07:11:29 +0000 (Wed, 25 Aug 2010)
Log Message:
-----------
MEDIA-168 Sort by "the displayed name of the media" instead that on the "title" property
Modified Paths:
--------------
trunk/openutils-mgnlcontextmenu/pom.xml
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
Modified: trunk/openutils-mgnlcontextmenu/pom.xml
===================================================================
--- trunk/openutils-mgnlcontextmenu/pom.xml 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlcontextmenu/pom.xml 2010-08-25 07:11:29 UTC (rev 2882)
@@ -124,7 +124,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.2</version>
+ <version>4.3-b3-SNAPSHOT</version>
<optional>true</optional>
</dependency>
<dependency>
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2010-08-25 07:11:29 UTC (rev 2882)
@@ -36,6 +36,7 @@
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
import net.sourceforge.openutils.mgnlmedia.media.pages.MediaFolderViewPage;
+import net.sourceforge.openutils.mgnlmedia.media.types.impl.BaseTypeHandler;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -160,6 +161,10 @@
{
c.addOrder(Order.asc("@title"));
}
+ else if (MediaFolderViewPage.SORT_BY_FILENAME.equals(sorting))
+ {
+ c.addOrder(Order.asc("@" + BaseTypeHandler.FILENAME_NODEDATA_NAME));
+ }
// paging
if (itemsPerPage > 0)
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java 2010-08-25 07:11:29 UTC (rev 2882)
@@ -24,25 +24,18 @@
import info.magnolia.cms.beans.runtime.MultipartForm;
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.NodeData;
-import info.magnolia.cms.i18n.I18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupportFactory;
import info.magnolia.cms.security.AccessDeniedException;
import info.magnolia.cms.util.NodeDataUtil;
-import info.magnolia.context.MgnlContext;
import info.magnolia.module.admininterface.SaveHandlerImpl;
import java.io.File;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
import java.util.Map;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
import javax.servlet.http.HttpServletRequest;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
@@ -68,6 +61,8 @@
*/
public static final String ORGINAL_NODEDATA_NAME = "original";
+ public static final String FILENAME_NODEDATA_NAME = "filename";
+
/**
* Logger.
*/
@@ -147,6 +142,8 @@
{
try
{
+ NodeDataUtil.getOrCreateAndSet(media, FILENAME_NODEDATA_NAME, getFilename(media));
+
if (media.hasContent("resolutions"))
{
Collection<NodeData> nodedatas = media.getChildByName("resolutions").getNodeDataCollection();
@@ -154,14 +151,14 @@
{
nd.delete();
}
- media.save();
}
if (MediaEl.module().isSingleinstance())
{
media.getMetaData().setActivated();
- media.save();
}
+
+ media.save();
}
catch (RepositoryException ex)
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2010-08-25 07:11:29 UTC (rev 2882)
@@ -106,6 +106,7 @@
media.sorting.score=Score
media.sorting.creationdate=Creation date
media.sorting.title=Title
+media.sorting.filename=Filename
stk.dam.mediauuid.description=Select or create a new media
stk.dam.mediauuid.label=Select media
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2010-08-25 07:11:29 UTC (rev 2882)
@@ -109,6 +109,7 @@
media.sorting.score=Rilevanza
media.sorting.creationdate=Data di creazione
media.sorting.title=Titolo
+media.sorting.filename=Nome del file
stk.dam.mediauuid.description=Seleziona o carica un nuovo media
stk.dam.mediauuid.label=Seleziona media
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-08-25 06:33:22 UTC (rev 2881)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-08-25 07:11:29 UTC (rev 2882)
@@ -331,6 +331,7 @@
[/#if]
<option value="creationdate"[#if this.sorting == 'creationdate'] selected="selected"[/#if]>${this.msgs.get('media.sorting.creationdate')}</option>
<option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>${this.msgs.get('media.sorting.title')}</option>
+ <option value="filename"[#if this.sorting == 'filename'] selected="selected"[/#if]>${this.msgs.get('media.sorting.filename')}</option>
</select>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
