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

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

Revision: 3354
          http://openutils.svn.sourceforge.net/openutils/?rev=3354&view=rev
Author:   diego_schivo
Date:     2011-02-17 11:47:22 +0000 (Thu, 17 Feb 2011)

Log Message:
-----------
MEDIA-218 avoid conflicts with search_saveHandler and search_configNode parameters

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.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-17 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java	2011-02-17 11:47:22 UTC (rev 3354)
@@ -64,14 +64,14 @@
         for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
         {
             String paramName = (String) paramNames.nextElement();
-            if (!StringUtils.startsWith(paramName, name + "_"))
+            if (!StringUtils.startsWith(paramName, name + "."))
             {
                 continue;
             }
             String[] paramValues = form.getParameterValues(paramName);
 
             Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
-            paramNode.setNodeData("name", StringUtils.removeStart(paramName, name + "_"));
+            paramNode.setNodeData("name", StringUtils.removeStart(paramName, name + "."));
             Value[] jcrValues = new Value[paramValues.length];
             for (int i = 0; i < paramValues.length; i++)
             {

Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl	2011-02-17 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl	2011-02-17 11:47:22 UTC (rev 3354)
@@ -1,5 +1,5 @@
 [#list request.parameterNames as pName]
-[#if pName?starts_with('${name}_')]
+[#if pName?starts_with('${name}.')]
 [#list request.getParameterValues(pName) as pValue]
 <input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
 [/#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-17 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2011-02-17 11:47:22 UTC (rev 3354)
@@ -49,7 +49,7 @@
 
   openPlaylistFromSearchDialog: function(){
     [#assign playlistHandle = this.request.getParameter('playlistHandle')!'']
-    parent.openWindow('.magnolia/dialogs/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#if !['selectMedia','saveAsPlaylist','command']?seq_contains(name)][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#if][/#list]');
+    parent.openWindow('.magnolia/dialogs/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#if !['selectMedia','saveAsPlaylist','command']?seq_contains(name)][#list this.request.getParameterValues(name) as value]&search.${name?js_string}=${value?js_string}[/#list][/#if][/#list]');
   }
 
 });


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