[Openutils-svn] SF.net SVN: openutils:[2732] trunk/openutils-mgnlmedia/src/main

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

Revision: 2732
          http://openutils.svn.sourceforge.net/openutils/?rev=2732&view=rev
Author:   diego_schivo
Date:     2010-06-29 17:15:45 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
MEDIA-145 sorting saved as cookie

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js

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 16:58:17 UTC (rev 2731)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-06-29 17:15:45 UTC (rev 2732)
@@ -97,6 +97,8 @@
 
     protected String type;
 
+    protected String bgSelector;
+
     protected String sorting;
 
     protected boolean selectMedia;
@@ -119,9 +121,9 @@
 
     protected String search;
 
-    private List<Page> pages;
+    protected List<Page> pages;
 
-    private int page;
+    protected int page;
 
     /**
      * @param name
@@ -166,10 +168,21 @@
             fillNumberOfMediaPerType();
         }
 
-        if (sorting == null)
+        bgSelector = null;
+        sorting = null;
+        for (Cookie cookie : request.getCookies())
         {
-            sorting = SORT_BY_MODIFICATIONDATE;
+            if ("bgselector".equals(cookie.getName()))
+            {
+                bgSelector = cookie.getValue();
+            }
+            else if ("sorting".equals(cookie.getName()))
+            {
+                sorting = cookie.getValue();
+            }
         }
+        bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
+        sorting = StringUtils.defaultString(sorting);
 
         if (page <= 0)
         {
@@ -573,21 +586,21 @@
     }
 
     /**
-     * Returns the sorting.
-     * @return the sorting
+     * Returns the bgSelector.
+     * @return the bgSelector
      */
-    public String getSorting()
+    public String getBgSelector()
     {
-        return sorting;
+        return bgSelector;
     }
 
     /**
-     * Sets the sorting.
-     * @param sorting the sorting to set
+     * Returns the sorting.
+     * @return the sorting
      */
-    public void setSorting(String sorting)
+    public String getSorting()
     {
-        this.sorting = sorting;
+        return sorting;
     }
 
     /**
@@ -802,18 +815,6 @@
         return MediaEl.module().isSingleinstance();
     }
 
-    public String getBgSelector()
-    {
-        for (Cookie cookie : request.getCookies())
-        {
-            if ("bgselector".equals(cookie.getName()))
-            {
-                return cookie.getValue();
-            }
-        }
-        return "white";
-    }
-
     public String getMessage(String key, String param)
     {
         return getMsgs().get(key, new String[]{param });

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js	2010-06-29 16:58:17 UTC (rev 2731)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js	2010-06-29 17:15:45 UTC (rev 2732)
@@ -71,7 +71,8 @@
   },
 
   handleSelectChange: function(){
-    location.href = '?type=' + this.options.type + '&path=' + this.options.path + '&sorting=' + this.select.get('value');
+    Cookie.write('sorting', this.select.get('value'), {duration: 30});
+    location.href = '?type=' + this.options.type + '&path=' + this.options.path;
   }
 
 });


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