[Openutils-svn] SF.net SVN: openutils:[2733] trunk/openutils-mgnlmedia

[<die...@us...>]

Revision: 2733
          http://openutils.svn.sourceforge.net/openutils/?rev=2733&view=rev
Author:   diego_schivo
Date:     2010-06-30 06:17:44 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
MEDIA-145 sorting

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/pom.xml
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml	2010-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/pom.xml	2010-06-30 06:17:44 UTC (rev 2733)
@@ -118,6 +118,11 @@
     </dependency>
     <dependency>
       <groupId>net.sourceforge.openutils</groupId>
+      <artifactId>openutils-mgnlutils</artifactId>
+      <version>1.0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge.openutils</groupId>
       <artifactId>openutils-elfunctions</artifactId>
       <version>1.1.1</version>
     </dependency>

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-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-30 06:17:44 UTC (rev 2733)
@@ -28,6 +28,7 @@
 import info.magnolia.cms.exchange.ExchangeException;
 import info.magnolia.cms.security.Permission;
 import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
 import info.magnolia.cms.util.ExclusiveWrite;
 import info.magnolia.commands.CommandsManager;
 import info.magnolia.context.Context;
@@ -75,6 +76,11 @@
 {
 
     /**
+     * 
+     */
+    public static final String SORT_BY_CREATIONDATE = "creationdate";
+
+    /**
      *
      */
     public static final String SORT_BY_FILENAME = "filename";
@@ -85,6 +91,11 @@
     public static final String SORT_BY_MODIFICATIONDATE = "modificationdate";
 
     /**
+     * 
+     */
+    public static final String SORT_BY_TITLE = "title";
+
+    /**
      *
      */
     public static final String SORT_BY_USAGE = "usage";
@@ -182,7 +193,7 @@
             }
         }
         bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
-        sorting = StringUtils.defaultString(sorting);
+        sorting = StringUtils.defaultIfEmpty(sorting, SORT_BY_CREATIONDATE);
 
         if (page <= 0)
         {
@@ -226,10 +237,9 @@
 
         if (!StringUtils.isBlank(path))
         {
-            try
+            Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+            if (folder != null)
             {
-                Content folder = hm.getContent(this.getPath());
-
                 writable = folder.isGranted(Permission.WRITE);
                 canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
 
@@ -243,10 +253,6 @@
                     5);
                 pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
             }
-            catch (RepositoryException ex)
-            {
-                log.error("Exception caught", ex);
-            }
         }
         else if (!StringUtils.isBlank(search))
         {

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-06-29 17:15:45 UTC (rev 2732)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2010-06-30 06:17:44 UTC (rev 2733)
@@ -148,7 +148,7 @@
       <div id="sortingblock">
         <div class="voice right" style="padding-top: 3px;">
           <select id="sorting" name="sorting">
-            <option value=""[#if this.sorting == ''] selected="selected"[/#if]>- order by -</option>
+            <option value=""[#if this.sorting == 'creationdate'] selected="selected"[/#if]>Creation date</option>
             <option value="title"[#if this.sorting == 'title'] selected="selected"[/#if]>Title</option>
           </select>
         </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.