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

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

Revision: 3316
          http://openutils.svn.sourceforge.net/openutils/?rev=3316&view=rev
Author:   diego_schivo
Date:     2011-02-08 11:34:02 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
MEDIA-214 playlist save

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
    trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
    trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java	2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java	2011-02-08 11:34:02 UTC (rev 3316)
@@ -35,6 +35,7 @@
 import javax.jcr.Value;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,11 +59,14 @@
         int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
     {
         Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
-        HttpServletRequest request = MgnlContext.getWebContext().getRequest();
-        for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
+        for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
         {
             String paramName = (String) paramNames.nextElement();
-            String[] paramValues = request.getParameterValues(paramName);
+            if (!StringUtils.startsWith(paramName, name + "_"))
+            {
+                continue;
+            }
+            String[] paramValues = form.getParameterValues(paramName);
 
             Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
             paramNode.setNodeData("name", paramName);

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java	2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchPlaylistSaveHandler.java	2011-02-08 11:34:02 UTC (rev 3316)
@@ -41,5 +41,7 @@
     protected void processSaveInfo(Content node, String saveInfo) throws PathNotFoundException, RepositoryException,
         AccessDeniedException
     {
+        // TODO Auto-generated method stub
+        super.processSaveInfo(node, saveInfo);
     }
 }

Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl	2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl	2011-02-08 11:34:02 UTC (rev 3316)
@@ -1,5 +1,7 @@
 [#list request.parameterNames as pName]
+[#if pName?starts_with('${name}_')]
 [#list request.getParameterValues(pName) as pValue]
-<input type="hidden" id="${name}_${pName}" name="${name}_${pName}" value="${pValue!''}" />
+<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
 [/#list]
+[/#if]
 [/#list]

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	2011-02-08 11:12:00 UTC (rev 3315)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2011-02-08 11:34:02 UTC (rev 3316)
@@ -48,7 +48,7 @@
   },
 
   openSearchPlaylistDialog: function(){
-    parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&${name?js_string}=${value?js_string}[/#list][/#list]');
+    parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&request_${name?js_string}=${value?js_string}[/#list][/#list]');
   }
 
 });


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