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

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

Revision: 3312
          http://openutils.svn.sourceforge.net/openutils/?rev=3312&view=rev
Author:   diego_schivo
Date:     2011-02-08 10:30:09 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
MEDIA-214 playlist save

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.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/MediaFolderViewPage.html

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-08 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchPage.java	2011-02-08 10:30:09 UTC (rev 3312)
@@ -249,43 +249,46 @@
 
     public String saveAsPlaylist()
     {
-        Set<String> excludeParamNames = new HashSet<String>();
-        excludeParamNames.add("saveAsPlaylist");
-        excludeParamNames.add("command");
-        try
+        if (false)
         {
-            HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
-            ValueFactory valueFactory = hm.getWorkspace().getSession().getValueFactory();
+            Set<String> excludeParamNames = new HashSet<String>();
+            excludeParamNames.add("saveAsPlaylist");
+            excludeParamNames.add("command");
+            try
+            {
+                HierarchyManager hm = MgnlContext.getSystemContext().getHierarchyManager(PlaylistConstants.REPO);
+                ValueFactory valueFactory = hm.getWorkspace().getSession().getValueFactory();
 
-            Content playlistNode = hm.createContent("/samples", "hello", PlaylistConstants.PLAYLIST.getSystemName());
-            Content requestNode = playlistNode.createContent("request", ItemType.CONTENTNODE);
-            for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
-            {
-                String paramName = (String) paramNames.nextElement();
-                if (excludeParamNames.contains(paramName))
+                Content playlistNode = hm.createContent("/samples", "hello", PlaylistConstants.PLAYLIST.getSystemName());
+                Content requestNode = playlistNode.createContent("request", ItemType.CONTENTNODE);
+                for (Enumeration paramNames = request.getParameterNames(); paramNames.hasMoreElements();)
                 {
-                    continue;
-                }
-                String[] paramValues = request.getParameterValues(paramName);
+                    String paramName = (String) paramNames.nextElement();
+                    if (excludeParamNames.contains(paramName))
+                    {
+                        continue;
+                    }
+                    String[] paramValues = request.getParameterValues(paramName);
 
-                Content paramNode = requestNode.createContent(
-                    Path.getUniqueLabel(requestNode, "0"),
-                    ItemType.CONTENTNODE);
-                paramNode.setNodeData("name", paramName);
-                Value[] jcrValues = new Value[paramValues.length];
-                for (int i = 0; i < paramValues.length; i++)
-                {
-                    jcrValues[i] = NodeDataUtil.createValue(paramValues[i], PropertyType.STRING, valueFactory);
+                    Content paramNode = requestNode.createContent(
+                        Path.getUniqueLabel(requestNode, "0"),
+                        ItemType.CONTENTNODE);
+                    paramNode.setNodeData("name", paramName);
+                    Value[] jcrValues = new Value[paramValues.length];
+                    for (int i = 0; i < paramValues.length; i++)
+                    {
+                        jcrValues[i] = NodeDataUtil.createValue(paramValues[i], PropertyType.STRING, valueFactory);
+                    }
+                    paramNode.setNodeData("value", jcrValues);
                 }
-                paramNode.setNodeData("value", jcrValues);
+                playlistNode.getParent().save();
             }
-            playlistNode.getParent().save();
+            catch (RepositoryException e)
+            {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
         }
-        catch (RepositoryException e)
-        {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
         return show();
     }
 }

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-08 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html	2011-02-08 10:30:09 UTC (rev 3312)
@@ -31,11 +31,11 @@
       <input type="hidden" name="selectMedia" value="${this.selectMedia?string('true', 'false')}" />
 
       <div class="row">
-        <input type="submit" name="submit" value="${this.msgs['buttons.search']}" class="button-submit"/>
+        <input type="submit" name="submit" 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" onclick="this.form.command.value = 'saveAsPlaylist'"/>
         <!--
-        <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="this.form.command.value = 'saveAsPlaylist'"/>
+        <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
         -->
-        <input type="submit" name="saveAsPlaylist" value="${this.msgs['buttons.saveAsPlaylist']}" class="button-submit" onclick="parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime()); return false;"/>
         <input type="hidden" name="command" value="" />
       </div>
     </form>

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 10:12:42 UTC (rev 3311)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html	2011-02-08 10:30:09 UTC (rev 3312)
@@ -38,10 +38,17 @@
   new MediaFolderView.Sorting('sorting', this.options);
     new MediaFolderView.EditMenus('li.media .menuitem');
     new MediaFolderView.InfoTooltips('li.media .image');
+    [#if (this.request.getParameter('command')!'') == 'saveAsPlaylist']
+    this.openSearchPlaylistDialog();
+    [/#if]
   },
 
   layout: function(){
     $('scrollablecontent').setStyle('height', window.getSize().y - 58 + 'px');
+  },
+
+  openSearchPlaylistDialog: function(){
+    parent.openWindow('.magnolia/dialogs/search-playlist.html?mgnlPath=&mgnlRepository=playlists&mgnlCK=' + (new Date()).getTime());
   }
 
 });


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