From: <die...@us...> - 2011-02-08 13:41:23
|
Revision: 3318 http://openutils.svn.sourceforge.net/openutils/?rev=3318&view=rev Author: diego_schivo Date: 2011-02-08 13:41:16 +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/pages/PlaylistView.java trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 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:48:48 UTC (rev 3317) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-08 13:41:16 UTC (rev 3318) @@ -67,7 +67,7 @@ String[] paramValues = form.getParameterValues(paramName); Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE); - paramNode.setNodeData("name", paramName); + 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/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 11:48:48 UTC (rev 3317) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java 2011-02-08 13:41:16 UTC (rev 3318) @@ -227,7 +227,7 @@ } } - String requestNodeName = "request"; + String requestNodeName = "search"; try { if (node.hasContent(requestNodeName)) Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 11:48:48 UTC (rev 3317) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.search-playlist.xml 2011-02-08 13:41:16 UTC (rev 3318) @@ -163,7 +163,7 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="request"> + <sv:node sv:name="search"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> 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:48:48 UTC (rev 3317) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-08 13:41:16 UTC (rev 3318) @@ -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]&request_${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]&search_${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. |