Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3348] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2011-02-17 10:54:47
|
Revision: 3348
http://openutils.svn.sourceforge.net/openutils/?rev=3348&view=rev
Author: diego_schivo
Date: 2011-02-17 10:54:41 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 playlist handle
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
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/PlaylistFromSearchDialogMVC.java
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
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/MediaFolderViewPage.html
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -40,7 +40,7 @@
private Map<String, SearchFilter> filters;
- private String playlistUUID;
+ private String playlistHandle;
/**
* Returns the selectMedia.
@@ -81,20 +81,20 @@
}
/**
- * Returns the playlistUUID.
- * @return the playlistUUID
+ * Returns the playlistHandle.
+ * @return the playlistHandle
*/
- public String getPlaylistUUID()
+ public String getPlaylistHandle()
{
- return playlistUUID;
+ return playlistHandle;
}
/**
- * Sets the playlistUUID.
- * @param playlistUUID the playlistUUID to set
+ * Sets the playlistHandle.
+ * @param playlistHandle the playlistHandle to set
*/
- public void setPlaylistUUID(String playlistUUID)
+ public void setPlaylistHandle(String playlistHandle)
{
- this.playlistUUID = playlistUUID;
+ this.playlistHandle = playlistHandle;
}
}
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -86,7 +86,7 @@
private Document zipFile;
- private String playlistUUID;
+ private String playlistHandle;
private String playlistSearch;
@@ -122,9 +122,9 @@
log.warn("Error retrieving media {}", actMedia);
}
}
- if (!StringUtils.isEmpty(playlistUUID))
+ if (!StringUtils.isEmpty(playlistHandle))
{
- Content playlistContent = ContentUtil.getContentByUUID(PlaylistConstants.REPO, playlistUUID);
+ Content playlistContent = ContentUtil.getContent(PlaylistConstants.REPO, playlistHandle);
try
{
if (playlistContent.hasContent("search"))
@@ -356,21 +356,21 @@
}
/**
- * Returns the playlistUUID.
- * @return the playlistUUID
+ * Returns the playlistHandle.
+ * @return the playlistHandle
*/
- public String getPlaylistUUID()
+ public String getPlaylistHandle()
{
- return playlistUUID;
+ return playlistHandle;
}
/**
- * Sets the playlistUUID.
- * @param playlistUUID the playlistUUID to set
+ * Sets the playlistHandle.
+ * @param playlistHandle the playlistHandle to set
*/
- public void setPlaylistUUID(String playlistUUID)
+ public void setPlaylistHandle(String playlistHandle)
{
- this.playlistUUID = playlistUUID;
+ this.playlistHandle = playlistHandle;
}
/**
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 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -56,6 +56,10 @@
public void save(Content parentNode, Content configNode, String name, MultipartForm form, int type, int valueType,
int isRichEditValue, int encoding) throws RepositoryException, AccessDeniedException
{
+ if (parentNode.hasContent(name))
+ {
+ parentNode.getContent(name).delete();
+ }
Content node = parentNode.createContent(name, ItemType.CONTENTNODE);
for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
{
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 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 10:54:41 UTC (rev 3348)
@@ -32,6 +32,7 @@
import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,9 +68,14 @@
protected void configureSaveHandler(SaveHandler saveHandler)
{
super.configureSaveHandler(saveHandler);
- saveHandler.setPath(form.getParameter("parentFolder"));
- saveHandler.setNodeName(form.getParameter("playlistName"));
- saveHandler.setRepository(PlaylistConstants.REPO);
+ if (!StringUtils.isEmpty(form.getParameter("parentFolder")))
+ {
+ saveHandler.setPath(form.getParameter("parentFolder"));
+ }
+ if (!StringUtils.isEmpty(form.getParameter("playlistName")))
+ {
+ saveHandler.setNodeName(form.getParameter("playlistName"));
+ }
saveHandler.setCreationItemType(PlaylistConstants.PLAYLIST);
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -16,12 +16,12 @@
var form = $('mediaSearchForm');
form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
new Event(e).stop();
- [#if this.playlistUUID?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ [#if this.playlistHandle?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
});
function saveAsPlaylist(update){
form.getElement('input[name=command]').set('value', 'saveAsPlaylist');
- form.getElement('input[name=playlistUUID]').set('value', update ? "${this.playlistUUID!''}" : '');
+ form.getElement('input[name=playlistHandle]').set('value', update ? "${this.playlistHandle!''}" : '');
form.submit();
}
});
@@ -49,7 +49,7 @@
<input type="submit" name="search" value="${this.msgs['buttons.search']}" class="button-submit" onclick="this.form.command.value = ''"/>
<input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" />
<input type="hidden" name="command" value="" />
- <input type="hidden" name="playlistUUID" value="" />
+ <input type="hidden" name="playlistHandle" value="" />
</div>
</form>
</body>
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-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -120,7 +120,7 @@
animFloat: false,
stateful: true,
deferredRender:false,
- activeTab:[#if (this.playlistUUID?has_content)]1[#else]0[/#if],
+ activeTab:[#if (this.playlistHandle?has_content)]1[#else]0[/#if],
items:[{
contentEl:'mediaTreeView',
title: 'Browse'
@@ -137,7 +137,7 @@
setTimeout(function() {
setTreeCollapsed(false);
frames['mediaTreeView'].location.href = getTreeUrl();
- frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&${this.playlistSearch!''}";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistHandle=${this.playlistHandle!''}&${this.playlistSearch!''}";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
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 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -48,7 +48,7 @@
},
openPlaylistFromSearchDialog: function(){
- parent.openWindow('.magnolia/dialogs/playlistAsSearch.html?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/updateSearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=/samples/hello&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]');
}
});
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-17 09:54:46 UTC (rev 3347)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-17 10:54:41 UTC (rev 3348)
@@ -55,7 +55,7 @@
icon: contextPath + '/.resources/media/icons/ico16-edit.png',
iconCls: 'button-edit-search',
handler: function(){
- parent.location.href = '${this.request.contextPath}/.magnolia/pages/mediaBrowser.html?playlistUUID=${this.playlist.uuid}';
+ parent.location.href = '${this.request.contextPath}/.magnolia/pages/mediaBrowser.html?playlistHandle=${this.playlist.handle}';
}
},
[#else]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
