Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3230] trunk/openutils-mgnlmedia/src/main
|
From: <die...@us...> - 2011-01-13 10:05:49
|
Revision: 3230
http://openutils.svn.sourceforge.net/openutils/?rev=3230&view=rev
Author: diego_schivo
Date: 2011-01-13 10:05:42 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
PIRMEDIA-202 revert: modified status search (does not work)
Modified Paths:
--------------
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
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
Property Changed:
----------------
trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/advancedsearch/SearchFilterStatus.java 2011-01-13 10:05:42 UTC (rev 3230)
@@ -58,12 +58,6 @@
{
criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, false));
}
- if (!values[0].equals("ALL") && "MOD".equals(values[0]))
- {
- criterionList.add(Restrictions.eq(META_DATA_MGNL_ACTIVATED, "true"));
- // https://issues.apache.org/jira/browse/JCR-2271
- criterionList.add(Restrictions.gt("MetaData/@mgnl:lastmodified", "MetaData/@mgnl:lastaction"));
- }
}
return criterionList;
}
Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-bootstrap/media-nooverwrite/config.modules.media.config.search.xml 2011-01-13 10:05:42 UTC (rev 3230)
@@ -559,46 +559,6 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="modified">
- <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:value>mix:lockable</sv:value>
- </sv:property>
- <sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>433e018a-acee-4699-8183-ff57367c1824</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>config.search.filters.options.modified</sv:value>
- </sv:property>
- <sv:property sv:name="value" sv:type="String">
- <sv:value>MOD</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-18T15:38:57.738+01:00</sv:value>
- </sv:property>
- <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2011-01-13T10:33:46.033+01:00</sv:value>
- </sv:property>
- </sv:node>
- </sv:node>
</sv:node>
</sv:node>
<sv:node sv:name="from">
Property changes on: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang
___________________________________________________________________
Deleted: svn:mergeinfo
- /branches/openutils-mgnlmedia-3.6.x/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang:1004
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-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages.properties 2011-01-13 10:05:42 UTC (rev 3230)
@@ -152,5 +152,4 @@
config.search.filters.options.all=All
config.search.filters.options.published=Published
config.search.filters.options.notpublished=Not published
-config.search.filters.options.modified=Modified
config.search.filters.uuid=UUID
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-01-13 09:48:58 UTC (rev 3229)
+++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/lang/messages_it.properties 2011-01-13 10:05:42 UTC (rev 3230)
@@ -155,5 +155,4 @@
config.search.filters.options.all=Tutti
config.search.filters.options.published=Pubblicati
config.search.filters.options.notpublished=Non pubblicati
-config.search.filters.options.modified=Modificato
config.search.filters.uuid=UUID
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
