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

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

Revision: 2665
          http://openutils.svn.sourceforge.net/openutils/?rev=2665&view=rev
Author:   diego_schivo
Date:     2010-06-18 06:35:26 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
restored method

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
    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/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-06-18 06:24:21 UTC (rev 2664)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2010-06-18 06:35:26 UTC (rev 2665)
@@ -39,6 +39,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
 import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
 import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBean;
+import net.sourceforge.openutils.mgnlmedia.media.pages.MediaBeanBuilder;
 import net.sourceforge.openutils.mgnlmedia.media.pages.MessagesTemplatedMVCHandler;
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
@@ -313,6 +314,23 @@
         return VIEW_XSPF;
     }
 
+    public String mediaFolder()
+    {
+        Content folder = ContentUtil.getContent(MediaModule.REPO, path);
+        if (folder != null)
+        {
+            Collection<Content> nodes = folder.getChildren(MediaConfigurationManager.MEDIA);
+            mediaBeans = new ArrayList<MediaBean>(nodes.size());
+            for (Content node : nodes)
+            {
+                MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getMediaTypeConfigurationFromMedia(node);
+                MediaBean bean = new MediaBeanBuilder(mtc).apply(node);
+                mediaBeans.add(bean);
+            }
+        }
+        return "-mediaFolder";
+    }
+
     /**
      * Returns the locale.
      * @return the locale

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	2010-06-18 06:24:21 UTC (rev 2664)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html	2010-06-18 06:35:26 UTC (rev 2665)
@@ -321,7 +321,7 @@
             },
             success: function(){
               var p = (index + 1) / items.length;
-              Ext.MessageBox.updateProgress(p, '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'.replace(/\{0\}/, parseInt(p * 100, 10) + '%');
+              Ext.MessageBox.updateProgress(p, '${this.msgs.get('playlist.entries.addMany.msgBox.progress')?js_string}'.replace(/\{0\}/, parseInt(p * 100, 10) + '%'));
               index++;
               addNextEntry();
             }


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