Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2010-06-29 15:28:29
|
Revision: 2727
http://openutils.svn.sourceforge.net/openutils/?rev=2727&view=rev
Author: diego_schivo
Date: 2010-06-29 15:28:18 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
MEDIA-145 number of items per media-type retrieved using Magnolia Criteria API
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 15:19:46 UTC (rev 2726)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-29 15:28:18 UTC (rev 2727)
@@ -173,18 +173,15 @@
numberOfMedia = new HashMap<String, Integer>();
for (MediaTypeConfiguration mtc : types)
{
- try
- {
- Collection<Content> c = MediaConfigurationManager.getInstance().find(
- path,
- mtc.getName(),
- search,
- StringUtils.isNotBlank(search));
- numberOfMedia.put(mtc.getName(), c.size());
- }
- catch (RepositoryException e)
- {
- }
+ AdvancedResult typeResult = MediaConfigurationManager.getInstance().find(
+ path,
+ mtc.getName(),
+ search,
+ StringUtils.isEmpty(search),
+ null,
+ 0,
+ -1);
+ numberOfMedia.put(mtc.getName(), (int) typeResult.getItems().getSize());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 06:24:47
|
Revision: 2734
http://openutils.svn.sourceforge.net/openutils/?rev=2734&view=rev
Author: diego_schivo
Date: 2010-06-30 06:24:40 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 06:17:44 UTC (rev 2733)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 06:24:40 UTC (rev 2734)
@@ -40,6 +40,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -230,7 +231,6 @@
@Override
public String show()
{
- HierarchyManager hm = MgnlContext.getInstance().getHierarchyManager(MediaModule.REPO);
final MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
AdvancedResult typeResult = null;
@@ -251,7 +251,6 @@
sorting,
page - 1,
5);
- pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
}
}
else if (!StringUtils.isBlank(search))
@@ -262,16 +261,14 @@
typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
}
- medias = null;
+ medias = CollectionUtils.EMPTY_COLLECTION;
+ pages = Collections.emptyList();
if (typeResult != null)
{
ResultIterator<AdvancedResultItem> items = typeResult.getItems();
medias = Lists.newArrayList(Iterators.transform(items, new MediaBeanBuilder(mtc)));
+ pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
}
- if (medias == null)
- {
- medias = CollectionUtils.EMPTY_COLLECTION;
- }
return super.show();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 08:59:44
|
Revision: 2744
http://openutils.svn.sourceforge.net/openutils/?rev=2744&view=rev
Author: diego_schivo
Date: 2010-06-30 08:59:38 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 moved call to fillNumberOfMediaPerType() from init() to show() because sub-classes (adv-search pages) do not need it
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 08:36:11 UTC (rev 2743)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 08:59:38 UTC (rev 2744)
@@ -177,11 +177,6 @@
types = MediaConfigurationManager.getInstance().getTypes().values();
}
- if (!StringUtils.isBlank(path) || !StringUtils.isBlank(search))
- {
- fillNumberOfMediaPerType();
- }
-
bgSelector = null;
sorting = null;
for (Cookie cookie : request.getCookies())
@@ -228,7 +223,10 @@
@Override
public String show()
{
- final MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
+ if (!StringUtils.isBlank(path) || !StringUtils.isBlank(search))
+ {
+ fillNumberOfMediaPerType();
+ }
AdvancedResult typeResult = null;
@@ -262,8 +260,8 @@
pages = Collections.emptyList();
if (typeResult != null)
{
- ResultIterator<AdvancedResultItem> items = typeResult.getItems();
- medias = Iterators.transform(items, new MediaBeanBuilder(mtc));
+ MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
+ medias = Iterators.transform(typeResult.getItems(), new MediaBeanBuilder(mtc));
pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 09:47:14
|
Revision: 2747
http://openutils.svn.sourceforge.net/openutils/?rev=2747&view=rev
Author: diego_schivo
Date: 2010-06-30 09:47:08 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 09:28:32 UTC (rev 2746)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 09:47:08 UTC (rev 2747)
@@ -53,8 +53,6 @@
import javax.servlet.http.HttpServletResponse;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaTypeConfiguration;
import net.sourceforge.openutils.mgnlmedia.media.lifecycle.MediaModule;
@@ -157,6 +155,7 @@
if (!StringUtils.isEmpty(mediaType))
{
+ // subset of types specified by selectMedia control
String[] mediaTypes = StringUtils.split(mediaType, ",");
type = mediaTypes[0];
types = new ArrayList<MediaTypeConfiguration>();
@@ -165,13 +164,12 @@
types.add(MediaConfigurationManager.getInstance().getTypes().get(mt));
}
}
- else if (type == null)
- {
- type = MediaConfigurationManager.getInstance().getTypes().entrySet().iterator().next().getKey();
- types = MediaConfigurationManager.getInstance().getTypes().values();
- }
else
{
+ if (StringUtils.isEmpty(type))
+ {
+ type = MediaConfigurationManager.getInstance().getTypes().keySet().iterator().next();
+ }
types = MediaConfigurationManager.getInstance().getTypes().values();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 10:09:43
|
Revision: 2748
http://openutils.svn.sourceforge.net/openutils/?rev=2748&view=rev
Author: diego_schivo
Date: 2010-06-30 10:09:36 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 refactoring
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 09:47:08 UTC (rev 2747)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:09:36 UTC (rev 2748)
@@ -153,6 +153,7 @@
{
super.init();
+ // left side of navigation bar
if (!StringUtils.isEmpty(mediaType))
{
// subset of types specified by selectMedia control
@@ -173,6 +174,7 @@
types = MediaConfigurationManager.getInstance().getTypes().values();
}
+ // right side of navigation bar
bgSelector = null;
sorting = null;
for (Cookie cookie : request.getCookies())
@@ -189,51 +191,48 @@
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
sorting = StringUtils.defaultIfEmpty(sorting, SORT_BY_CREATIONDATE);
+ // for activation status handling
develop = SystemProperty.getBooleanProperty("magnolia.develop");
}
/**
- * Count medias for each media type
+ * Counts media items for the specified type.
+ * @param mtc
+ * @return
*/
- private void fillNumberOfMediaPerType()
+ protected int countMediaItems(MediaTypeConfiguration mtc)
{
- numberOfMedia = new HashMap<String, Integer>();
- for (MediaTypeConfiguration mtc : types)
+ if (StringUtils.isEmpty(path) && StringUtils.isBlank(search))
{
- AdvancedResult typeResult = MediaConfigurationManager.getInstance().find(
- path,
- mtc.getName(),
- search,
- StringUtils.isEmpty(search),
- null,
- 0,
- 1);
- numberOfMedia.put(mtc.getName(), (int) typeResult.getItems().getSize());
+ return 0;
}
+ numberOfMedia = new HashMap<String, Integer>();
+ AdvancedResult typeResult = MediaConfigurationManager.getInstance().find(
+ path,
+ mtc.getName(),
+ search,
+ StringUtils.isEmpty(search),
+ null,
+ 0,
+ 1);
+ return (int) typeResult.getItems().getSize();
}
/**
- * {@inheritDoc}
+ * Finds media items to show.
+ * @return
*/
- @Override
- public String show()
+ protected AdvancedResult findMediaItems()
{
- if (!StringUtils.isBlank(path) || !StringUtils.isBlank(search))
+ AdvancedResult result = null;
+ if (!StringUtils.isEmpty(path))
{
- fillNumberOfMediaPerType();
- }
-
- AdvancedResult typeResult = null;
-
- if (!StringUtils.isBlank(path))
- {
Content folder = ContentUtil.getContent(MediaModule.REPO, path);
if (folder != null)
{
writable = folder.isGranted(Permission.WRITE);
canPublish = writable && ActivationManagerFactory.getActivationManager().hasAnyActiveSubscriber();
-
- typeResult = MediaConfigurationManager.getInstance().find(
+ result = MediaConfigurationManager.getInstance().find(
folder.getHandle(),
type,
null,
@@ -247,19 +246,33 @@
{
writable = false;
canPublish = false;
+ result = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, 1);
+ }
+ return result;
+ }
- typeResult = MediaConfigurationManager.getInstance().find(null, type, search, false, sorting, 0, -1);
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String show()
+ {
+ numberOfMedia = new HashMap<String, Integer>();
+ for (MediaTypeConfiguration mtc : types)
+ {
+ numberOfMedia.put(mtc.getName(), countMediaItems(mtc));
}
medias = Iterators.emptyIterator();
pages = Collections.emptyList();
- if (typeResult != null)
+ AdvancedResult result = findMediaItems();
+ if (result != null)
{
MediaTypeConfiguration mtc = MediaConfigurationManager.getInstance().getTypes().get(type);
// casts Iterator<AdvancedResultItem> to Iterator<Content>
- Iterator<Content> contentIterator = Iterators.filter(typeResult.getItems(), Content.class);
+ Iterator<Content> contentIterator = Iterators.filter(result.getItems(), Content.class);
medias = Iterators.transform(contentIterator, new MediaBeanBuilder(mtc));
- pages = MgnlPagingElFunctions.pageList(typeResult.getNumberOfPages(), 5, "page");
+ pages = MgnlPagingElFunctions.pageList(result.getNumberOfPages(), 5, "page");
}
return super.show();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 10:14:16
|
Revision: 2749
http://openutils.svn.sourceforge.net/openutils/?rev=2749&view=rev
Author: diego_schivo
Date: 2010-06-30 10:14:10 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 fix
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:09:36 UTC (rev 2748)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:14:10 UTC (rev 2749)
@@ -206,7 +206,6 @@
{
return 0;
}
- numberOfMedia = new HashMap<String, Integer>();
AdvancedResult typeResult = MediaConfigurationManager.getInstance().find(
path,
mtc.getName(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 10:37:06
|
Revision: 2754
http://openutils.svn.sourceforge.net/openutils/?rev=2754&view=rev
Author: diego_schivo
Date: 2010-06-30 10:37:00 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 total-size (avoid getting iterator)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:32:48 UTC (rev 2753)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:37:00 UTC (rev 2754)
@@ -214,7 +214,7 @@
null,
0,
1);
- return (int) typeResult.getItems().getSize();
+ return typeResult.getTotalSize();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-06-30 10:51:14
|
Revision: 2755
http://openutils.svn.sourceforge.net/openutils/?rev=2755&view=rev
Author: diego_schivo
Date: 2010-06-30 10:51:08 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
MEDIA-145 sorting must be specified for total-size to work (-1 otherwise)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:37:00 UTC (rev 2754)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-06-30 10:51:08 UTC (rev 2755)
@@ -211,7 +211,8 @@
path,
search,
StringUtils.isEmpty(search),
- null,
+ // sorting must be specified for total-size to work (-1 otherwise)
+ SORT_BY_CREATIONDATE,
0,
1);
return typeResult.getTotalSize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2010-09-10 14:55:44
|
Revision: 3030
http://openutils.svn.sourceforge.net/openutils/?rev=3030&view=rev
Author: diego_schivo
Date: 2010-09-10 14:55:38 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-177 fix
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:46:23 UTC (rev 3029)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 14:55:38 UTC (rev 3030)
@@ -259,7 +259,7 @@
{
itemsPerPage = module.getFolderViewItemsPerPage();
}
- return module.getSearch().search(request, type, path, false, sorting, module.getFolderViewItemsPerPage(), page);
+ return module.getSearch().search(request, type, path, false, sorting, itemsPerPage, page);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-09-10 15:33:01
|
Revision: 3035
http://openutils.svn.sourceforge.net/openutils/?rev=3035&view=rev
Author: fgiust
Date: 2010-09-10 15:32:55 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-179 handle default sorting
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:29:16 UTC (rev 3034)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:32:55 UTC (rev 3035)
@@ -172,7 +172,7 @@
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
- if (SortMode.valueOf(sorting) == null)
+ if (sorting == null || SortMode.valueOf(sorting) == null)
{
sorting = getDefaultSorting().name();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2010-09-10 16:02:49
|
Revision: 3037
http://openutils.svn.sourceforge.net/openutils/?rev=3037&view=rev
Author: fgiust
Date: 2010-09-10 16:02:43 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
MEDIA-179 don't crash on invalid sort parameters
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 15:42:15 UTC (rev 3036)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2010-09-10 16:02:43 UTC (rev 3037)
@@ -172,8 +172,16 @@
}
bgSelector = StringUtils.defaultIfEmpty(bgSelector, "white");
pagesizeSelector = StringUtils.defaultIfEmpty(pagesizeSelector, "size1");
- if (sorting == null || SortMode.valueOf(sorting) == null)
+
+ try
{
+ if (sorting == null || SortMode.valueOf(sorting) == null)
+ {
+ sorting = getDefaultSorting().name();
+ }
+ }
+ catch (IllegalArgumentException e)
+ {
sorting = getDefaultSorting().name();
}
// for activation status handling
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-11-06 17:12:49
|
Revision: 3686
http://openutils.svn.sourceforge.net/openutils/?rev=3686&view=rev
Author: fgiust
Date: 2011-11-06 17:12:42 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
use media/activate as command name also in the folder view
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-11-06 17:09:49 UTC (rev 3685)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-11-06 17:12:42 UTC (rev 3686)
@@ -430,7 +430,7 @@
@SuppressWarnings("unchecked")
public String activate()
{
- Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "activateMedia");
+ Command cmd = CommandsManager.getInstance().getCommand("media", "activate");
ActivationCommand actCmd = (ActivationCommand) cmd;
@@ -466,7 +466,7 @@
@SuppressWarnings("unchecked")
public String deactivate()
{
- Command cmd = CommandsManager.getInstance().getCommand(CommandsManager.DEFAULT_CATALOG, "deactivate");
+ Command cmd = CommandsManager.getInstance().getCommand("media", "deactivate");
Context context = MgnlContext.getInstance();
context.put(Context.ATTRIBUTE_REPOSITORY, MediaModule.REPO);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2011-11-19 21:00:17
|
Revision: 3696
http://openutils.svn.sourceforge.net/openutils/?rev=3696&view=rev
Author: fgiust
Date: 2011-11-19 21:00:10 +0000 (Sat, 19 Nov 2011)
Log Message:
-----------
MEDIA-271 MediaFolderViewPage: media search always performed twice
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-11-19 17:14:59 UTC (rev 3695)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.java 2011-11-19 21:00:10 UTC (rev 3696)
@@ -243,9 +243,16 @@
if (result.getTotalSize() > 0 && result.getNumberOfPages() < page)
{
page = 1;
+ result = module.getSearch().search(
+ request,
+ type,
+ path,
+ false,
+ SortMode.valueOf(sorting),
+ itemsPerPage,
+ page);
}
- result = module.getSearch().search(request, type, path, false, SortMode.valueOf(sorting), itemsPerPage, page);
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X