Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <hu...@op...> - 2011-03-04 18:43:20
|
See <https://hudson.openmindonline.it/job/openutils-mgnlcriteria/net.sourceforge.openutils$openutils-mgnlcriteria/142/changes> |
|
From: <fn...@us...> - 2011-03-04 18:00:48
|
Revision: 3364
http://openutils.svn.sourceforge.net/openutils/?rev=3364&view=rev
Author: fnecci
Date: 2011-03-04 18:00:42 +0000 (Fri, 04 Mar 2011)
Log Message:
-----------
CRIT-34 Test for new feature request
Added Paths:
-----------
trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
Added: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java (rev 0)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2011-03-04 18:00:42 UTC (rev 3364)
@@ -0,0 +1,149 @@
+/**
+ *
+ * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html)
+ * Copyright(C) 2009-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlcriteria.advanced;
+
+import info.magnolia.cms.beans.config.ContentRepository;
+import info.magnolia.context.MgnlContext;
+import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
+import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
+import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+
+/**
+ * Tests pagination in criteria queries.
+ * @author fnecci
+ */
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml")
+public class OrderingTest extends TestNgRepositoryTestcase
+{
+
+ private static String[] LETTERS_ARRAY = {
+ "A",
+ "B",
+ "C",
+ "D",
+ "E",
+ "F",
+ "G",
+ "H",
+ "I",
+ "J",
+ "K",
+ "L",
+ "M",
+ "N",
+ "O",
+ "P",
+ "Q",
+ "R",
+ "S",
+ "T",
+ "U",
+ "V",
+ "W",
+ "X",
+ "Y",
+ "Z" };
+
+ private int PAGINATION_LENGTH = 10;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+
+ super.setUp();
+
+ // Titles of the nodes in this workspace:
+ // - Letters
+ // --- A
+ // --- B
+ // --- C
+ // --- ...
+ // --- X
+ // --- Y
+ // --- Z
+ MgnlContext.getHierarchyManager(ContentRepository.WEBSITE).save();
+ }
+
+ /**
+ * Retrieves all letters.
+ * @throws Exception
+ */
+ @Test
+ public void testNoOrderNoPagination() throws Exception
+ {
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
+ criteria.setBasePath("/letters");
+ criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+ AdvancedResult advResult = criteria.execute();
+
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+
+ ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
+
+ int i = 0;
+ for (AdvancedResultItem currentResult : resultIterator)
+ {
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i]);
+ i++;
+ }
+ }
+
+ /**
+ * Retrieves all letters.
+ * @throws Exception
+ */
+ @Test
+ public void testNoOrderWithPagination() throws Exception
+ {
+
+ Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
+ criteria.setBasePath("/letters");
+ criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+ criteria.setPaging(PAGINATION_LENGTH, 1);
+ AdvancedResult advResult = criteria.execute();
+
+ Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
+
+ ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH);
+
+ int i = 0;
+ for (AdvancedResultItem currentResult : resultIterator)
+ {
+ Assert.assertEquals(currentResult.getTitle(), LETTERS_ARRAY[i]);
+ i++;
+ }
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-02-25 11:09:42
|
Revision: 3363
http://openutils.svn.sourceforge.net/openutils/?rev=3363&view=rev
Author: fgiust
Date: 2011-02-25 11:09:36 +0000 (Fri, 25 Feb 2011)
Log Message:
-----------
added CDATA to annotation
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2011-02-20 22:28:25 UTC (rev 3362)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView-xspf.html 2011-02-25 11:09:36 UTC (rev 3363)
@@ -35,7 +35,7 @@
[/#if]
[/#if]
[#if (mediaNode['description_' + mediaLocale])?exists]
- <annotation>${mediaNode['description_' + mediaLocale]}</annotation>
+ <annotation><![CDATA[${mediaNode['description_' + mediaLocale]}]]></annotation>
[/#if]
[#if (mediaNode.media_duration)?exists]
<duration>${(mediaNode.media_duration * 1000)?string.computer}</duration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-02-20 22:28:32
|
Revision: 3362
http://openutils.svn.sourceforge.net/openutils/?rev=3362&view=rev
Author: fgiust
Date: 2011-02-20 22:28:25 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-02-20 22:28:18 UTC (rev 3361)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-02-20 22:28:25 UTC (rev 3362)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4-b2</version>
+ <version>4.4-b3-SNAPSHOT</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b2</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-02-20 22:28:24
|
Revision: 3361
http://openutils.svn.sourceforge.net/openutils/?rev=3361&view=rev
Author: fgiust
Date: 2011-02-20 22:28:18 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-mgnlmedia-4.4-b2
Added Paths:
-----------
tags/openutils-mgnlmedia-4.4-b2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-02-20 22:28:04
|
Revision: 3360
http://openutils.svn.sourceforge.net/openutils/?rev=3360&view=rev
Author: fgiust
Date: 2011-02-20 22:27:57 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-mgnlmedia-4.4-b2
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-02-20 22:14:17 UTC (rev 3359)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-02-20 22:27:57 UTC (rev 3360)
@@ -10,7 +10,7 @@
<artifactId>openutils-mgnlmedia</artifactId>
<name>SimpleMedia Module for Magnolia CMS</name>
<description>SimpleMedia Module for Magnolia CMS: a module for Magnolia CMS for easier management of multimedia assets.</description>
- <version>4.4-b2-SNAPSHOT</version>
+ <version>4.4-b2</version>
<inceptionYear>2008</inceptionYear>
<licenses>
<license>
@@ -24,9 +24,9 @@
<url>http://jira.openmindlab.com/browse/MEDIA</url>
</issueManagement>
<scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/trunk/openutils-mgnlmedia</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/trunk/openutils-mgnlmedia</url>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-mgnlmedia-4.4-b2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-mgnlmedia-4.4-b2</url>
</scm>
<build>
<resources>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 3359
http://openutils.svn.sourceforge.net/openutils/?rev=3359&view=rev
Author: fgiust
Date: 2011-02-20 22:14:17 +0000 (Sun, 20 Feb 2011)
Log Message:
-----------
add back check on the type filter (needed for populating the number of results in tabs)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-02-17 13:23:50 UTC (rev 3358)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/configuration/SearchMediaQueryConfiguration.java 2011-02-20 22:14:17 UTC (rev 3359)
@@ -119,7 +119,11 @@
// filters
for (String key : filters.keySet())
{
-
+ if ("type".equals(key) && !StringUtils.isEmpty(mediaType))
+ {
+ // restriction on type already set
+ continue;
+ }
SearchFilter filter = filters.get(key);
path = StringUtils.defaultIfEmpty(filter.getBasePath(key, request), path);
for (Criterion criterion : filter.getCriterionList(key, request))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 13:23:56
|
Revision: 3358
http://openutils.svn.sourceforge.net/openutils/?rev=3358&view=rev
Author: diego_schivo
Date: 2011-02-17 13:23:50 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-219 width, height
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml 2011-02-17 13:21:00 UTC (rev 3357)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml 2011-02-17 13:23:50 UTC (rev 3358)
@@ -12,12 +12,18 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchBasedPlaylistDialogMVC</sv:value>
</sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>500</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Playlist</sv:value>
</sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>520</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -35,7 +41,7 @@
<sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-17T11:59:14.042+01:00</sv:value>
+ <sv:value>2011-02-17T14:21:38.669+01:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="tabGeneral">
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml 2011-02-17 13:21:00 UTC (rev 3357)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml 2011-02-17 13:23:50 UTC (rev 3358)
@@ -12,12 +12,18 @@
<sv:property sv:name="class" sv:type="String">
<sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchBasedPlaylistDialogMVC</sv:value>
</sv:property>
+ <sv:property sv:name="height" sv:type="String">
+ <sv:value>500</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
<sv:property sv:name="label" sv:type="String">
<sv:value>Playlist</sv:value>
</sv:property>
+ <sv:property sv:name="width" sv:type="String">
+ <sv:value>520</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -35,7 +41,7 @@
<sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-17T11:59:24.147+01:00</sv:value>
+ <sv:value>2011-02-17T14:22:12.809+01:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="tabGeneral">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 13:21:08
|
Revision: 3357
http://openutils.svn.sourceforge.net/openutils/?rev=3357&view=rev
Author: diego_schivo
Date: 2011-02-17 13:21:00 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-219 LayerDialog
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
Deleted: 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 11:56:26 UTC (rev 3356)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 13:21:00 UTC (rev 3357)
@@ -1,127 +0,0 @@
-/**
- *
- * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
- * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
-
-import info.magnolia.cms.core.Content;
-import info.magnolia.cms.gui.misc.Sources;
-import info.magnolia.module.admininterface.SaveHandler;
-import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
-
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * @author ADMIN
- * @version $Id: $
- */
-public class PlaylistFromSearchDialogMVC extends ConfiguredDialog
-{
-
- /**
- * Logger.
- */
- private Logger log = LoggerFactory.getLogger(PlaylistFromSearchDialogMVC.class);
-
- /**
- *
- */
- public PlaylistFromSearchDialogMVC(
- String name,
- HttpServletRequest request,
- HttpServletResponse response,
- Content configNode)
- {
- super(name, request, response, configNode);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void configureSaveHandler(SaveHandler saveHandler)
- {
- super.configureSaveHandler(saveHandler);
- 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);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPreSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPreSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected boolean onPostSave(SaveHandler control)
- {
- // TODO Auto-generated method stub
- return super.onPostSave(control);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void renderHtml(String view) throws IOException
- {
- if (VIEW_CLOSE_WINDOW.equals(view))
- {
- PrintWriter out = this.getResponse().getWriter();
-
- out.println("<html>"); //$NON-NLS-1$
- out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
- out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
- String path = StringUtils.defaultIfEmpty(form.getParameter("mgnlPath"), form.getParameter("parentFolder")
- + "/"
- + form.getParameter("playlistName"));
- out
- .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + path + "'"); //$NON-NLS-1$
- out.println("</script></html>"); //$NON-NLS-1$
- }
- else
- {
- super.renderHtml(view);
- }
- }
-}
Added: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/SearchBasedPlaylistDialogMVC.java 2011-02-17 13:21:00 UTC (rev 3357)
@@ -0,0 +1,121 @@
+/**
+ *
+ * SimpleMedia Module for Magnolia CMS (http://www.openmindlab.com/lab/products/media.html)
+ * Copyright(C) 2008-2011, Openmind S.r.l. http://www.openmindonline.it
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.sourceforge.openutils.mgnlmedia.playlist.dialog;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.gui.dialog.Dialog;
+import info.magnolia.cms.gui.misc.Sources;
+import info.magnolia.module.admininterface.SaveHandler;
+import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.jcr.RepositoryException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sourceforge.openutils.mgnlmedia.media.dialog.LayerDialog;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
+
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * @author ADMIN
+ * @version $Id: $
+ */
+public class SearchBasedPlaylistDialogMVC extends ConfiguredDialog
+{
+
+ /**
+ * Logger.
+ */
+ private Logger log = LoggerFactory.getLogger(SearchBasedPlaylistDialogMVC.class);
+
+ /**
+ *
+ */
+ public SearchBasedPlaylistDialogMVC(
+ String name,
+ HttpServletRequest request,
+ HttpServletResponse response,
+ Content configNode)
+ {
+ super(name, request, response, configNode);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected Dialog createDialog(Content configNode, Content storageNode) throws RepositoryException
+ {
+ Dialog dialog = new LayerDialog();
+ dialog.init(request, response, storageNode, configNode);
+ return dialog;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void configureSaveHandler(SaveHandler saveHandler)
+ {
+ super.configureSaveHandler(saveHandler);
+ 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);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void renderHtml(String view) throws IOException
+ {
+ if (VIEW_CLOSE_WINDOW.equals(view))
+ {
+ PrintWriter out = this.getResponse().getWriter();
+
+ out.println("<html>"); //$NON-NLS-1$
+ out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
+ out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
+ String path = StringUtils.defaultIfEmpty(form.getParameter("mgnlPath"), form.getParameter("parentFolder")
+ + "/"
+ + form.getParameter("playlistName"));
+ out
+ .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + path + "'"); //$NON-NLS-1$
+ out.println("</script></html>"); //$NON-NLS-1$
+ }
+ else
+ {
+ super.renderHtml(view);
+ }
+ }
+}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml 2011-02-17 11:56:26 UTC (rev 3356)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml 2011-02-17 13:21:00 UTC (rev 3357)
@@ -10,7 +10,7 @@
<sv:value>5ba32092-19e2-47cf-b3ad-19359c61412f</sv:value>
</sv:property>
<sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchBasedPlaylistDialogMVC</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml 2011-02-17 11:56:26 UTC (rev 3356)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml 2011-02-17 13:21:00 UTC (rev 3357)
@@ -10,7 +10,7 @@
<sv:value>72b20e23-4e15-4e47-9a8b-dc8d0d834996</sv:value>
</sv:property>
<sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.SearchBasedPlaylistDialogMVC</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:56:32
|
Revision: 3356
http://openutils.svn.sourceforge.net/openutils/?rev=3356&view=rev
Author: diego_schivo
Date: 2011-02-17 11:56:26 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 exclude playlistHandle parameter
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
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 11:55:48 UTC (rev 3355)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 11:56:26 UTC (rev 3356)
@@ -49,7 +49,7 @@
openPlaylistFromSearchDialog: function(){
[#assign playlistHandle = this.request.getParameter('playlistHandle')!'']
- parent.openWindow('.magnolia/dialogs/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&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/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#if !['selectMedia','saveAsPlaylist','command','playlistHandle']?seq_contains(name)][#list this.request.getParameterValues(name) as value]&search.${name?js_string}=${value?js_string}[/#list][/#if][/#list]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:55:56
|
Revision: 3355
http://openutils.svn.sourceforge.net/openutils/?rev=3355&view=rev
Author: diego_schivo
Date: 2011-02-17 11:55:48 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 fix reload playlist
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
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 11:47:22 UTC (rev 3354)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:55:48 UTC (rev 3355)
@@ -112,7 +112,7 @@
out.println("<html>"); //$NON-NLS-1$
out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
- String path = StringUtils.defaultString(form.getParameter("mgnlPath"), form.getParameter("parentFolder")
+ String path = StringUtils.defaultIfEmpty(form.getParameter("mgnlPath"), form.getParameter("parentFolder")
+ "/"
+ form.getParameter("playlistName"));
out
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:47:29
|
Revision: 3354
http://openutils.svn.sourceforge.net/openutils/?rev=3354&view=rev
Author: diego_schivo
Date: 2011-02-17 11:47:22 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 avoid conflicts with search_saveHandler and search_configNode parameters
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java
trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
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/save/HiddenParametersSaveHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-17 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/save/HiddenParametersSaveHandler.java 2011-02-17 11:47:22 UTC (rev 3354)
@@ -64,14 +64,14 @@
for (Enumeration paramNames = form.getParameterNames(); paramNames.hasMoreElements();)
{
String paramName = (String) paramNames.nextElement();
- if (!StringUtils.startsWith(paramName, name + "_"))
+ if (!StringUtils.startsWith(paramName, name + "."))
{
continue;
}
String[] paramValues = form.getParameterValues(paramName);
Content paramNode = node.createContent(Path.getUniqueLabel(node, "0"), ItemType.CONTENTNODE);
- paramNode.setNodeData("name", StringUtils.removeStart(paramName, name + "_"));
+ paramNode.setNodeData("name", StringUtils.removeStart(paramName, name + "."));
Value[] jcrValues = new Value[paramValues.length];
for (int i = 0; i < paramValues.length; i++)
{
Modified: trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-17 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/resources/dialog/hiddenParameters.ftl 2011-02-17 11:47:22 UTC (rev 3354)
@@ -1,5 +1,5 @@
[#list request.parameterNames as pName]
-[#if pName?starts_with('${name}_')]
+[#if pName?starts_with('${name}.')]
[#list request.getParameterValues(pName) as pValue]
<input type="hidden" id="${pName}" name="${pName}" value="${pValue!''}" />
[/#list]
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 11:36:49 UTC (rev 3353)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 11:47:22 UTC (rev 3354)
@@ -49,7 +49,7 @@
openPlaylistFromSearchDialog: function(){
[#assign playlistHandle = this.request.getParameter('playlistHandle')!'']
- parent.openWindow('.magnolia/dialogs/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&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/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&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]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:36:56
|
Revision: 3353
http://openutils.svn.sourceforge.net/openutils/?rev=3353&view=rev
Author: diego_schivo
Date: 2011-02-17 11:36:49 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 confirm message i18n
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-02-17 11:19:44 UTC (rev 3352)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-02-17 11:36:49 UTC (rev 3353)
@@ -142,6 +142,8 @@
playlist.details.description=Description
playlist.save=Save
playlist.search.edit=Edit search
+playlist.confirmUpdate.title=Update existing playlist
+playlist.confirmUpdate.text=Do you want to update playlist {0} ?
config.search.filters.locale=Locale
config.search.filters.text=Text
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-02-17 11:19:44 UTC (rev 3352)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-02-17 11:36:49 UTC (rev 3353)
@@ -145,6 +145,8 @@
playlist.details.description=Descrizione
playlist.save=Salva
playlist.search.edit=Modifica ricerca
+playlist.confirmUpdate.title=Aggiorna playlist esistente
+playlist.confirmUpdate.text=Aggiornare la playlist {0} ?
config.search.filters.locale=Locale
config.search.filters.text=Testo
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 11:19:44 UTC (rev 3352)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 11:36:49 UTC (rev 3353)
@@ -16,7 +16,7 @@
var form = $('mediaSearchForm');
form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
new Event(e).stop();
- [#if this.playlistHandle?has_content]parent.extConfirm('Update existing playlist', 'Do you want to update playlist ${this.playlistHandle?js_string} ?', saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ [#if this.playlistHandle?has_content]parent.extConfirm("${this.msgs['playlist.confirmUpdate.title']?js_string}", "${this.msgs.get('playlist.confirmUpdate.text', [this.playlistHandle])?js_string}", saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
});
function saveAsPlaylist(update){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:19:50
|
Revision: 3352
http://openutils.svn.sourceforge.net/openutils/?rev=3352&view=rev
Author: diego_schivo
Date: 2011-02-17 11:19:44 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 confirm message
Modified Paths:
--------------
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
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 11:14:16 UTC (rev 3351)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 11:19:44 UTC (rev 3352)
@@ -16,7 +16,7 @@
var form = $('mediaSearchForm');
form.getElement('input[name=saveAsPlaylist]').addEvent('click', function(e){
new Event(e).stop();
- [#if this.playlistHandle?has_content]parent.confirmUpdatePlaylist(saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
+ [#if this.playlistHandle?has_content]parent.extConfirm('Update existing playlist', 'Do you want to update playlist ${this.playlistHandle?js_string} ?', saveAsPlaylist);[#else]saveAsPlaylist();[/#if]
});
function saveAsPlaylist(update){
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 11:14:16 UTC (rev 3351)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 11:19:44 UTC (rev 3352)
@@ -306,9 +306,9 @@
uploadDlg.show();
}
-function confirmUpdatePlaylist(callback)
+function extConfirm(title, text, callback)
{
- Ext.MessageBox.confirm('Confirm', 'Update existing playlist?', function(btn){
+ Ext.MessageBox.confirm(title, text, function(btn){
callback(btn == 'yes');
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:14:22
|
Revision: 3351
http://openutils.svn.sourceforge.net/openutils/?rev=3351&view=rev
Author: diego_schivo
Date: 2011-02-17 11:14:16 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 reload updated playlist
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java
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 11:11:32 UTC (rev 3350)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/dialog/PlaylistFromSearchDialogMVC.java 2011-02-17 11:14:16 UTC (rev 3351)
@@ -112,8 +112,11 @@
out.println("<html>"); //$NON-NLS-1$
out.println(new Sources(this.getRequest().getContextPath()).getHtmlJs());
out.println("<script type=\"text/javascript\">"); //$NON-NLS-1$
+ String path = StringUtils.defaultString(form.getParameter("mgnlPath"), form.getParameter("parentFolder")
+ + "/"
+ + form.getParameter("playlistName"));
out
- .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + form.getParameter("parentFolder") + "/" + form.getParameter("playlistName") + "'"); //$NON-NLS-1$
+ .println("parent.location.href = '" + getRequest().getContextPath() + "/.magnolia/pages/playlistsBrowser.html?openPath=" + path + "'"); //$NON-NLS-1$
out.println("</script></html>"); //$NON-NLS-1$
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:11:40
|
Revision: 3350
http://openutils.svn.sourceforge.net/openutils/?rev=3350&view=rev
Author: diego_schivo
Date: 2011-02-17 11:11:32 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 fix update
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
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 11:01:05 UTC (rev 3349)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 11:11:32 UTC (rev 3350)
@@ -48,7 +48,8 @@
},
openPlaylistFromSearchDialog: function(){
- 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]');
+ [#assign playlistHandle = this.request.getParameter('playlistHandle')!'']
+ parent.openWindow('.magnolia/dialogs/[#if playlistHandle?has_content]update[#else]save[/#if]SearchBasedPlaylist.html?mgnlRepository=playlists&mgnlPath=${playlistHandle}&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]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 11:01:12
|
Revision: 3349
http://openutils.svn.sourceforge.net/openutils/?rev=3349&view=rev
Author: diego_schivo
Date: 2011-02-17 11:01:05 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 save/update playlist dialogs
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
Removed Paths:
-------------
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
Deleted: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml 2011-02-17 10:54:41 UTC (rev 3348)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.playlistAsSearch.xml 2011-02-17 11:01:05 UTC (rev 3349)
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sv:node sv:name="playlistAsSearch" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>aa50c92e-cad0-493b-ab7f-facecac2a284</sv:value>
- </sv:property>
- <sv:property sv:name="class" sv:type="String">
- <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T18:43:46.422+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="tabGeneral">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>301b55cd-e68f-47f3-85a3-9a1b3507b45f</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>tab</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-07T20:47:33.255+01:00</sv:value>
- </sv:property>
- </sv:node>
- <sv:node sv:name="parentFolder">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>f4648ddb-b34b-4cf1-a657-a897159a2721</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>link</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Parent folder</sv:value>
- </sv:property>
- <sv:property sv:name="required" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="tree" sv:type="String">
- <sv:value>playlist-folders</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T19:07:23.860+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="playlistName">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>8174d77e-7be3-43a3-bfe9-babbdac23b19</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Playlist name</sv:value>
- </sv:property>
- <sv:property sv:name="required" sv:type="String">
- <sv:value>true</sv:value>
- </sv:property>
- <sv:property sv:name="saveInfo" sv:type="String">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T19:07:33.464+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="maxResults">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>1294413b-03fa-43ed-9333-ccbdd8ebd2e1</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>edit</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="label" sv:type="String">
- <sv:value>Max results</sv:value>
- </sv:property>
- <sv:property sv:name="type" sv:type="String">
- <sv:value>Long</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T14:48:01.729+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- <sv:node sv:name="search">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
- <sv:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>805c4546-515e-48d0-a8ae-20fde5108303</sv:value>
- </sv:property>
- <sv:property sv:name="controlType" sv:type="String">
- <sv:value>hiddenParameters</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:node sv:name="MetaData">
- <sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:metaData</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:activated" sv:type="Boolean">
- <sv:value>false</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:authorid" sv:type="String">
- <sv:value>superuser</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-02-08T11:55:44.769+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
- </sv:node>
-</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.saveSearchBasedPlaylist.xml 2011-02-17 11:01:05 UTC (rev 3349)
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="saveSearchBasedPlaylist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>5ba32092-19e2-47cf-b3ad-19359c61412f</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:14.042+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>93b2f45b-9cd0-4269-8139-fa44c1806fcd</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:05.189+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="parentFolder">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>c62167d7-4da6-45ec-93ab-4a64974dd97b</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>link</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Parent folder</sv:value>
+ </sv:property>
+ <sv:property sv:name="required" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="tree" sv:type="String">
+ <sv:value>playlist-folders</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:05.189+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="playlistName">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>960dc19a-526e-4fb8-b297-469214d225a7</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist name</sv:value>
+ </sv:property>
+ <sv:property sv:name="required" sv:type="String">
+ <sv:value>true</sv:value>
+ </sv:property>
+ <sv:property sv:name="saveInfo" sv:type="String">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:05.189+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="maxResults">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>09e2c4fe-e1ea-415c-b117-929d05e41bc8</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Max results</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Long</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:05.189+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="search">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>05b0d3e4-03a0-4bf3-91d3-a2830f66de46</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:05.189+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Added: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media/config.modules.media.dialogs.updateSearchBasedPlaylist.xml 2011-02-17 11:01:05 UTC (rev 3349)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="updateSearchBasedPlaylist" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>72b20e23-4e15-4e47-9a8b-dc8d0d834996</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlmedia.playlist.dialog.PlaylistFromSearchDialogMVC</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:25.515+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:24.147+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="tabGeneral">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6536caaf-36a9-409f-9bf6-70e2173091ad</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>tab</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Playlist</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:31:50.312+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:18.448+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="maxResults">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d5e21dda-2e61-4310-9196-e9460613b92e</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="label" sv:type="String">
+ <sv:value>Max results</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>Long</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:18.448+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="search">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>03be5d55-18d4-42dd-a2d9-ab23ad08fef9</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>hiddenParameters</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-02-04T16:32:31.109+01:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2011-02-17T11:59:18.468+01:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <die...@us...> - 2011-02-17 09:54:52
|
Revision: 3347
http://openutils.svn.sourceforge.net/openutils/?rev=3347&view=rev
Author: diego_schivo
Date: 2011-02-17 09:54:46 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 confirm update playlist
Modified Paths:
--------------
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
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:25:57 UTC (rev 3346)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaAdvancedSearchFormPage.html 2011-02-17 09:54:46 UTC (rev 3347)
@@ -11,9 +11,24 @@
<script src="${this.request.contextPath}/.resources/calendar/calendar-setup.js" type="text/javascript"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-core.js"></script>
<script type="text/javascript" src="${this.request.contextPath}/.resources/media/js/mootools-1.2-more.js"></script>
+ <script type="text/javascript">
+window.addEvent('domready', function(){
+ 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]
+ });
+
+ function saveAsPlaylist(update){
+ form.getElement('input[name=command]').set('value', 'saveAsPlaylist');
+ form.getElement('input[name=playlistUUID]').set('value', update ? "${this.playlistUUID!''}" : '');
+ form.submit();
+ }
+});
+ </script>
</head>
<body id="mgnl">
- <form action="${this.request.contextPath}/media/search" target="mediaFolderView">
+ <form id="mediaSearchForm" action="${this.request.contextPath}/media/search" target="mediaFolderView">
[#macro msgIfAvail key]
[#if !(this.msgs[key])?starts_with("???")]${this.msgs[key]}[#else]${key}[/#if]
[/#macro]
@@ -31,9 +46,10 @@
<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" 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="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="" />
</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:25:57 UTC (rev 3346)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-17 09:54:46 UTC (rev 3347)
@@ -305,6 +305,13 @@
});
uploadDlg.show();
}
+
+function confirmUpdatePlaylist(callback)
+{
+ Ext.MessageBox.confirm('Confirm', 'Update existing playlist?', function(btn){
+ callback(btn == 'yes');
+ });
+}
//]]>
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 09:26:04
|
Revision: 3346
http://openutils.svn.sourceforge.net/openutils/?rev=3346&view=rev
Author: diego_schivo
Date: 2011-02-17 09:25:57 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 edit search button
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-02-17 09:21:06 UTC (rev 3345)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-02-17 09:25:57 UTC (rev 3346)
@@ -141,6 +141,7 @@
playlist.details.title=Title
playlist.details.description=Description
playlist.save=Save
+playlist.search.edit=Edit search
config.search.filters.locale=Locale
config.search.filters.text=Text
Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-02-17 09:21:06 UTC (rev 3345)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-02-17 09:25:57 UTC (rev 3346)
@@ -144,6 +144,7 @@
playlist.details.title=Titolo
playlist.details.description=Descrizione
playlist.save=Salva
+playlist.search.edit=Modifica ricerca
config.search.filters.locale=Locale
config.search.filters.text=Testo
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:21:06 UTC (rev 3345)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.html 2011-02-17 09:25:57 UTC (rev 3346)
@@ -51,9 +51,9 @@
[#if (!this.playlist?exists)]
[#elseif (this.playlist.searchBased)]
{
- text: playlist.msgs.addEntry,
- icon: contextPath + '/.resources/media/icons/ico16-add.png',
- iconCls: 'button-search',
+ text: playlist.msgs.editSearch,
+ 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}';
}
@@ -400,6 +400,7 @@
addEntries: '${this.msgs.get('playlist.entries.addMany')?js_string}',
removeEntry: '${this.msgs.get('playlist.entries.remove')?js_string}',
editMedia: '${this.msgs.get('playlist.media.edit')?js_string}',
+ editSearch: '${this.msgs.get('playlist.search.edit')?js_string}',
addManyEntriesMsgBoxTitle: '${this.msgs.get('playlist.entries.addMany.msgBox.title')?js_string}',
addManyEntriesMsgBoxMsg: '${this.msgs.get('playlist.entries.addMany.msgBox.msg')?js_string}',
addManyEntriesProgressStart: '${this.msgs.get('playlist.entries.addMany.msgBox.progressStart')?js_string}',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 09:21:12
|
Revision: 3345
http://openutils.svn.sourceforge.net/openutils/?rev=3345&view=rev
Author: diego_schivo
Date: 2011-02-17 09:21:06 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
MEDIA-218 exclude some parameters
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html
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:08:43 UTC (rev 3344)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2011-02-17 09:21:06 UTC (rev 3345)
@@ -48,7 +48,7 @@
},
openPlaylistFromSearchDialog: function(){
- parent.openWindow('.magnolia/dialogs/playlistAsSearch.html?mgnlCK=' + (new Date()).getTime() + '[#list this.request.parameterNames as name][#list this.request.getParameterValues(name) as value]&search_${name?js_string}=${value?js_string}[/#list][/#list]');
+ 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]');
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-17 09:08:49
|
Revision: 3344
http://openutils.svn.sourceforge.net/openutils/?rev=3344&view=rev
Author: diego_schivo
Date: 2011-02-17 09:08:43 +0000 (Thu, 17 Feb 2011)
Log Message:
-----------
update dependency
Modified Paths:
--------------
trunk/magnolia-test-webapp/pom.xml
Modified: trunk/magnolia-test-webapp/pom.xml
===================================================================
--- trunk/magnolia-test-webapp/pom.xml 2011-02-16 19:11:45 UTC (rev 3343)
+++ trunk/magnolia-test-webapp/pom.xml 2011-02-17 09:08:43 UTC (rev 3344)
@@ -137,7 +137,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-mgnlmedia</artifactId>
- <version>4.3.2-SNAPSHOT</version>
+ <version>4.4-b2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-16 19:11:51
|
Revision: 3343
http://openutils.svn.sourceforge.net/openutils/?rev=3343&view=rev
Author: diego_schivo
Date: 2011-02-16 19:11:45 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
MEDIA-218 search parameters
Modified Paths:
--------------
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
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 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.java 2011-02-16 19:11:45 UTC (rev 3343)
@@ -24,13 +24,17 @@
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.i18n.Messages;
import info.magnolia.cms.util.AlertUtil;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.cms.util.NodeDataUtil;
import info.magnolia.context.MgnlContext;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.zip.ZipFile;
import javax.jcr.RepositoryException;
@@ -42,6 +46,7 @@
import net.sourceforge.openutils.mgnlmedia.media.zip.DefaultZipImporter;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporter;
import net.sourceforge.openutils.mgnlmedia.media.zip.ZipImporterException;
+import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
@@ -83,6 +88,8 @@
private String playlistUUID;
+ private String playlistSearch;
+
/**
* @param name command name
* @param request
@@ -115,6 +122,28 @@
log.warn("Error retrieving media {}", actMedia);
}
}
+ if (!StringUtils.isEmpty(playlistUUID))
+ {
+ Content playlistContent = ContentUtil.getContentByUUID(PlaylistConstants.REPO, playlistUUID);
+ try
+ {
+ if (playlistContent.hasContent("search"))
+ {
+ List<String> params = new ArrayList<String>();
+ for (Content content : playlistContent.getContent("search").getChildren())
+ {
+ String paramName = NodeDataUtil.getString(content, "name");
+ String paramValue = NodeDataUtil.getString(content, "value");
+ params.add(paramName + "=" + paramValue);
+ }
+ playlistSearch = StringUtils.join(params, '&');
+ }
+ }
+ catch (RepositoryException e)
+ {
+ // should never happen
+ }
+ }
}
/**
@@ -345,6 +374,24 @@
}
/**
+ * Returns the playlistSearch.
+ * @return the playlistSearch
+ */
+ public String getPlaylistSearch()
+ {
+ return playlistSearch;
+ }
+
+ /**
+ * Sets the playlistSearch.
+ * @param playlistSearch the playlistSearch to set
+ */
+ public void setPlaylistSearch(String playlistSearch)
+ {
+ this.playlistSearch = playlistSearch;
+ }
+
+ /**
* {@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 18:26:23 UTC (rev 3342)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-16 19:11:45 UTC (rev 3343)
@@ -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!''}&query=hello&type=video&type=document";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&${this.playlistSearch!''}";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-16 18:26:30
|
Revision: 3342
http://openutils.svn.sourceforge.net/openutils/?rev=3342&view=rev
Author: diego_schivo
Date: 2011-02-16 18:26:23 +0000 (Wed, 16 Feb 2011)
Log Message:
-----------
MEDIA-218 search fields initialization
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
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:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaBrowserPage.html 2011-02-16 18:26:23 UTC (rev 3342)
@@ -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!''}";
+ frames['advancedSearchView'].location.href = "${this.request.contextPath}/.magnolia/pages/media-advsearchform.html?selectMedia="+selectMedia+"&playlistUUID=${this.playlistUUID!''}&query=hello&type=video&type=document";
if (openPath != null && openPath != "null" && openPath.length > 0)
{
reloadFolder(openPath);
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/checkbox.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -5,7 +5,7 @@
[#list filter.options as option]
<div class="inner-row">
- <input type="checkbox" id="${filterKey}_${option.value}" name="${filterKey}" value="${option.value}" />
+ <input type="checkbox" id="${filterKey}_${option.value}" name="${filterKey}" value="${option.value}"[#if ((this.request.getParameterValues(filterKey)![])?seq_contains(option.value))] checked="checked"[/#if] />
<label for="${filterKey}_${option.value}">[@msgIfAvail option.label /]</span>
</div>
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/date.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -3,7 +3,7 @@
<label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
- <input type="text" name="${filterKey}" id="${filterKey}" value="" class="input-date" />
+ <input type="text" name="${filterKey}" id="${filterKey}" value="${this.request.getParameter(filterKey)!''}" class="input-date" />
<span class="mgnlControlButton" id="butt_${filterKey}" onclick="cal_butt_${filterKey}.show()">${this.msgs['buttons.date']}</span>
<script type="text/javascript">
// <![CDATA[
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/input.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -3,7 +3,7 @@
<label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
- <input type="text" name="${filterKey}" value="" class="text" />
+ <input type="text" name="${filterKey}" value="${this.request.getParameter(filterKey)!''}" class="text" />
<br />
[@rendersFilter filter.subfilters /]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/path.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -3,7 +3,7 @@
<label for="${filterKey}">[@msgIfAvail filter.label /]</label>
[/#if]
- <input type="text" name="${filterKey}" id="${filterKey}" value="" class="input-path" />
+ <input type="text" name="${filterKey}" id="${filterKey}" value="${this.request.getParameter(filterKey)!''}" class="input-path" />
<span class="mgnlControlButton" id="butt_${filterKey}" onclick="mgnlDialogLinkOpenBrowser('${filterKey}', 'media', '')">${this.msgs['buttons.select']}</span>
[@rendersFilter filter.subfilters /]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/radio.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -5,7 +5,7 @@
[#list filter.options as option]
<div class="inner-row">
- <input type="radio" id="${filterKey}_${option.value}" name="${filterKey}" value="${option.value}" [#if option.defaultValue?? & option.defaultValue]checked="checked"[/#if] />
+ <input type="radio" id="${filterKey}_${option.value}" name="${filterKey}" value="${option.value}" [#if (!this.request.getParameter(filterKey)?has_content & option.defaultValue?? & option.defaultValue) || (this.request.getParameter(filterKey)?has_content & this.request.getParameter(filterKey) == option.value)]checked="checked"[/#if] />
<label for="${filterKey}_${option.value}">[@msgIfAvail option.label /]</span>
</div>
[/#list]
Modified: trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl 2011-02-16 17:59:28 UTC (rev 3341)
+++ trunk/openutils-mgnlmedia/src/main/resources/search/freemarker/controls/select.ftl 2011-02-16 18:26:23 UTC (rev 3342)
@@ -5,7 +5,7 @@
<select name="${filterKey}" id="${filterKey}">
[#list filter.options as option]
- <option value="${option.value}" [#if option.defaultValue?? & option.defaultValue]selected="selected"[/#if]>[@msgIfAvail option.label /]</option>
+ <option value="${option.value}" [#if (!this.request.getParameter(filterKey)?has_content & option.defaultValue?? & option.defaultValue) || (this.request.getParameter(filterKey)?has_content & this.request.getParameter(filterKey) == option.value)]selected="selected"[/#if]>[@msgIfAvail option.label /]</option>
[/#list]
</select>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2011-02-16 17:59:34
|
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.
|
