Revision: 3335 http://openutils.svn.sourceforge.net/openutils/?rev=3335&view=rev Author: fgiust Date: 2011-02-09 20:15:27 +0000 (Wed, 09 Feb 2011) Log Message: ----------- removed hardcoded context path Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-09 19:52:52 UTC (rev 3334) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-09 20:15:27 UTC (rev 3335) @@ -32,7 +32,6 @@ import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,7 +106,8 @@ out.println("<html>"); //$NON-NLS-1$ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs()); out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$ - out.println("parent.location.href = '/open/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$ + out + .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$ out.println("</script></html>"); //$NON-NLS-1$ } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-02-17 11:14:22
|
Revision: 3351 http://openutils.svn.sourceforge.net/openutils/?rev=3351&view=rev Author: diego_schivo Date: 2011-02-17 11:14:16 +0000 (Thu, 17 Feb 2011) Log Message: ----------- MEDIA-218 reload updated playlist Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:11:32 UTC (rev 3350) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:14:16 UTC (rev 3351) @@ -112,8 +112,11 @@ out.println("<html>"); //$NON-NLS-1$ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs()); out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$ + String path = StringUtils.defaultString(form.getParameter("mgnlPath"), form.getParameter("parentFolder") + + "/" + + form.getParameter("playlistName")); out - .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$ + .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + path + "'"); //$NON-NLS-1$ out.println("</script></html>"); //$NON-NLS-1$ } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <die...@us...> - 2011-02-17 11:55:56
|
Revision: 3355 http://openutils.svn.sourceforge.net/openutils/?rev=3355&view=rev Author: diego_schivo Date: 2011-02-17 11:55:48 +0000 (Thu, 17 Feb 2011) Log Message: ----------- MEDIA-218 fix reload playlist Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java =================================================================== --- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:47:22 UTC (rev 3354) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:55:48 UTC (rev 3355) @@ -112,7 +112,7 @@ out.println("<html>"); //$NON-NLS-1$ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs()); out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$ - String path = StringUtils.defaultString(form.getParameter("mgnlPath"), form.getParameter("parentFolder") + String path = StringUtils.defaultIfEmpty(form.getParameter("mgnlPath"), form.getParameter("parentFolder") + "/" + form.getParameter("playlistName")); out This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |