Author: knguyen
Date: Wed Jan 23 10:16:51 2008
New Revision: 19566
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19566&repname=
=3Djahia
Log:
tags variables reuse
Modified:
trunk/core/src/java/org/jahia/data/containers/ContainerFilterByContaine=
rDefinitions.java
trunk/core/src/java/org/jahia/taglibs/query/CategoryTag.java
trunk/core/src/java/org/jahia/taglibs/query/ContentDefinitionTag.java
trunk/core/src/java/org/jahia/taglibs/query/NotTag.java
Modified: trunk/core/src/java/org/jahia/data/containers/ContainerFilterByCo=
ntainerDefinitions.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/ContainerFilterByContainerDefinitions.java&rev=3D1=
9566&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/data/containers/ContainerFilterByContaine=
rDefinitions.java (original)
+++ trunk/core/src/java/org/jahia/data/containers/ContainerFilterByContaine=
rDefinitions.java Wed Jan 23 10:16:51 2008
@@ -408,8 +408,9 @@
Map parameters =3D new HashMap();
StringBuffer buff =3D new StringBuffer("SELECT c.comp_id FROM Jahi=
aContainer c WHERE ");
if (siteIds !=3D null && siteIds.length > 0) {
+ buff.append(" ( ");
for (int i=3D0;i<siteIds.length; i++){
- buff.append(" c.siteId =3D ").append(String.valueOf(siteId=
s[i])).append(" ");
+ buff.append(" c.siteId =3D ").append(String.valueOf(siteId=
s[i]));
if (i<siteIds.length-1){
buff.append(" OR ");
}
Modified: trunk/core/src/java/org/jahia/taglibs/query/CategoryTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/query/CategoryTag.java&rev=3D19566&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/query/CategoryTag.java (original)
+++ trunk/core/src/java/org/jahia/taglibs/query/CategoryTag.java Wed Jan 23=
10:16:51 2008
@@ -23,6 +23,7 @@
public int doEndTag() throws JspException {
int eval =3D super.doEndTag();
categoryKeys =3D null;
+ constraint =3D null;
return eval;
}
=
Modified: trunk/core/src/java/org/jahia/taglibs/query/ContentDefinitionTag.=
java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/query/ContentDefinitionTag.java&rev=3D19566&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/query/ContentDefinitionTag.java (=
original)
+++ trunk/core/src/java/org/jahia/taglibs/query/ContentDefinitionTag.java W=
ed Jan 23 10:16:51 2008
@@ -25,6 +25,7 @@
int eval =3D super.doEndTag();
definitionNames =3D null;
aliasNames =3D null;
+ constraint =3D null;
return eval;
}
=
Modified: trunk/core/src/java/org/jahia/taglibs/query/NotTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/query/NotTag.java&rev=3D19566&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/query/NotTag.java (original)
+++ trunk/core/src/java/org/jahia/taglibs/query/NotTag.java Wed Jan 23 10:1=
6:51 2008
@@ -24,6 +24,7 @@
public int doEndTag() throws JspException {
int eval =3D super.doEndTag();
notConstraint =3D null;
+ constraints =3D null;
return eval;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
