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

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

Revision: 3341
          http://openutils.svn.sourceforge.net/openutils/?rev=3341&view=rev
Author:   diego_schivo
Date:     2011-02-16 17:59:28 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
MEDIA-218 from playlist to adv-search

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/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.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-16 17:18:42 UTC (rev 3340)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.java	2011-02-16 17:59:28 UTC (rev 3341)
@@ -40,6 +40,8 @@
 
     private Map<String, SearchFilter> filters;
 
+    private String playlistUUID;
+
     /**
      * Returns the selectMedia.
      * @return the selectMedia
@@ -77,4 +79,22 @@
     {
         return filters;
     }
+
+    /**
+     * Returns the playlistUUID.
+     * @return the playlistUUID
+     */
+    public String getPlaylistUUID()
+    {
+        return playlistUUID;
+    }
+
+    /**
+     * Sets the playlistUUID.
+     * @param playlistUUID the playlistUUID to set
+     */
+    public void setPlaylistUUID(String playlistUUID)
+    {
+        this.playlistUUID = playlistUUID;
+    }
 }

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-16 17:18:42 UTC (rev 3340)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java	2011-02-16 17:59:28 UTC (rev 3341)
@@ -81,6 +81,8 @@
 
     private Document zipFile;
 
+    private String playlistUUID;
+
     /**
      * @param name command name
      * @param request
@@ -325,6 +327,24 @@
     }
 
     /**
+     * Returns the playlistUUID.
+     * @return the playlistUUID
+     */
+    public String getPlaylistUUID()
+    {
+        return playlistUUID;
+    }
+
+    /**
+     * Sets the playlistUUID.
+     * @param playlistUUID the playlistUUID to set
+     */
+    public void setPlaylistUUID(String playlistUUID)
+    {
+        this.playlistUUID = playlistUUID;
+    }
+
+    /**
      * {@inheritDoc}
      */
     @Override

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-16 17:18:42 UTC (rev 3340)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html	2011-02-16 17:59:28 UTC (rev 3341)
@@ -120,7 +120,7 @@
         animFloat: false,
         stateful: true,
         deferredRender:false,
-        activeTab:0,
+        activeTab:[#if (this.playlistUUID?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;
+    frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}";
     if (openPath != null && openPath != "null" && openPath.length > 0)
     {
       reloadFolder(openPath);

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-16 17:18:42 UTC (rev 3340)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2011-02-16 17:59:28 UTC (rev 3341)
@@ -48,10 +48,20 @@
   ]);
 
   var tbar = [
-[#if (!this.playlist.searchBased)]
+[#if (!this.playlist?exists)]
+[#elseif (this.playlist.searchBased)]
     {
       text: playlist.msgs.addEntry,
       icon: contextPath + '/.resources/media/icons/ico16-add.png',
+      iconCls: 'button-search',
+      handler: function(){
+        parent.location.href = '${this.request.contextPath}/.magnolia/pages/mediaBrowser.html?playlistUUID=${this.playlist.uuid}';
+      }
+    },
+[#else]
+    {
+      text: playlist.msgs.addEntry,
+      icon: contextPath + '/.resources/media/icons/ico16-add.png',
       iconCls: 'button-add',
       handler: function(){
         var mgnlWin = parent.parent;
@@ -250,7 +260,7 @@
         enableColLock: false,
         tbar: tbar,
         stripeRows: true
-[#if (!this.playlist.searchBased)]
+[#if (this.playlist?exists && !this.playlist.searchBased)]
         , plugins: [dd]
 [/#if]
       }


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