From: <die...@us...> - 2011-03-23 12:37:56
|
Revision: 3393 http://openutils.svn.sourceforge.net/openutils/?rev=3393&view=rev Author: diego_schivo Date: 2011-03-23 12:37:50 +0000 (Wed, 23 Mar 2011) Log Message: ----------- MEDIA-223 mediafolderpath cookie Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 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 2011-03-23 12:27:33 UTC (rev 3392) +++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-03-23 12:37:50 UTC (rev 3393) @@ -86,6 +86,8 @@ protected String sorting; + protected String mediaFolderPath; + protected boolean selectMedia; protected String actMediaHandle; @@ -155,6 +157,7 @@ bgSelector = null; pagesizeSelector = null; sorting = null; + mediaFolderPath = null; for (Cookie cookie : request.getCookies()) { if ("bgselector".equals(cookie.getName())) @@ -169,6 +172,10 @@ { sorting = cookie.getValue(); } + else if ("mediafolderpath".equals(cookie.getName())) + { + mediaFolderPath = cookie.getValue(); + } } bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white"); pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1"); @@ -619,6 +626,15 @@ } /** + * Returns the mediaFolderPath. + * @return the mediaFolderPath + */ + public String getMediaFolderPath() + { + return mediaFolderPath; + } + + /** * Returns the writable. * @return the writable */ 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 2011-03-23 12:27:33 UTC (rev 3392) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-03-23 12:37:50 UTC (rev 3393) @@ -18,7 +18,7 @@ var viewport; var nodeid = "${this.nodeid!''}"; var selectMedia = ${this.selectMedia?string("true", "false")}; -var openPath = "${this.openPath!Cookie.read('mediafolder')!''}"; +var openPath = "${this.openPath!this.mediaFolderPath!''}"; var actMediaHandle = "${this.actMediaHandle!''}"; var mediaType = "${this.mediaType!''}"; // get tree url This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |