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

[<fg...@us...>]

Revision: 3073
          http://openutils.svn.sourceforge.net/openutils/?rev=3073&view=rev
Author:   fgiust
Date:     2010-09-12 08:24:58 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
MEDIA-176 not so stateful...

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/media.js
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html

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-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java	2010-09-12 08:24:58 UTC (rev 3073)
@@ -230,7 +230,25 @@
         {
             itemsPerPage = module.getFolderViewItemsPerPage();
         }
-        return module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page);
+
+        AdvancedResult result = module.getSearch().search(
+            request,
+            type,
+            path,
+            false,
+            SortMode.valueOf(sorting),
+            itemsPerPage,
+            page);
+
+        // back to page 1 if an invalid page number is selected
+        if (result.getTotalSize() > 0 && result.getNumberOfPages() < page)
+        {
+            page = 1;
+        }
+
+        result = module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page);
+
+        return result;
     }
 
     /**

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js	2010-09-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/media.js	2010-09-12 08:24:58 UTC (rev 3073)
@@ -72,6 +72,6 @@
 });
 
 mgnlTree.prototype.openFolder = function(contextPath, handle, writable) {
-	if (parent.reloadFolder) parent.reloadFolder(handle);
+	if (parent.reloadFolder) parent.reloadFolder(handle, null, true);
 }
 

Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:04:57 UTC (rev 3072)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2010-09-12 08:24:58 UTC (rev 3073)
@@ -226,8 +226,9 @@
 }
 
 // reload folder content
-function reloadFolder(path, type)
+function reloadFolder(path, type, isbrowse)
 {
+
   var centerPanel = viewport.getComponent('center-panel');
   (selectMedia ? centerPanel : centerPanel.getComponent('center-center-panel')).setTitle("Media - "+ path);
 
@@ -235,11 +236,12 @@
   
   var querystring = frames['mediaFolderView'].location.search.substring(1).cleanQueryString().parseQueryString();
   
-  if (url == "") {
+  if (isbrowse || url == "") {
     url = "${this.request.contextPath}/.magnolia/pages/mediaFolderView.html";
   }
   
   querystring['path'] = path;
+
   querystring['mgnlCK'] = (new Date()).getTime();
   
   if (selectMedia)


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