Author: bpapez
Date: Fri Jan 25 13:35:40 2008
New Revision: 19581
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19581&repname=
=3Djahia
Log:
more fixes for Meditel's request to return staged containers by StagedConta=
inerFilterByContainerDefinition
Modified:
trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java
trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
Modified: trunk/core/src/java/org/jahia/data/containers/StagedContainerFilt=
erByContainerDefinition.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/data/containers/StagedContainerFilterByContainerDefinition.java&re=
v=3D19581&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/StagedContainerFilterByCo=
ntainerDefinition.java (original)
+++ trunk/core/src/java/org/jahia/data/containers/StagedContainerFilterByCo=
ntainerDefinition.java Fri Jan 25 13:35:40 2008
@@ -152,7 +152,7 @@
.getBean(JahiaContainerManager.class.getName());
List ctnIds =3D containerMgr.getContainerIds(new Integer(listId),
siteIds, new Boolean((siteIds !=3D null && siteIds.length>=
0)),
- containerDefinitionNames, this.entryLoadRequest, false, tr=
ue,
+ containerDefinitionNames, this.entryLoadRequest, true, tru=
e,
true, (siteIds !=3D null && siteIds.length>0),pagesID);
=
BitSet bits =3D new BitSet();
Modified: trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/hibernate/dao/JahiaContainerDAO.java&rev=3D19581&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/hibernate/dao/JahiaContainerDAO.java (ori=
ginal)
+++ trunk/core/src/java/org/jahia/hibernate/dao/JahiaContainerDAO.java Fri =
Jan 25 13:35:40 2008
@@ -619,7 +619,7 @@
StringBuffer buff =3D new StringBuffer(1024);
HashMap parameters =3D new HashMap();
buff.append(" select distinct c.comp_id.id, c.comp_id.workflowStat=
e, c.comp_id.versionId, c.jahiaAclId, c.pageid from JahiaContainer c ");
- if (!ignoreLang) {
+ if (!ignoreLang || stagingOnly || loadRequest.isStaging()) {
buff.append(", JahiaFieldsData f ");
}
buff.append(" where ");
@@ -1416,27 +1416,31 @@
private void appendContainerMultilangAndWorkflowParams(StringBuffer qu=
ery,
HashMap params, EntryLoadRequest entryLoadRequest,
boolean ignoreLang, boolean stagingOnly) {
- if (stagingOnly) {
- query.append(" c.comp_id.workflowState > ");
+ if (stagingOnly || entryLoadRequest.isStaging() || !ignoreLang) {
+ query.append(" c.comp_id.id=3Df.containerId AND (");
+ } =
+ if (stagingOnly || entryLoadRequest.isStaging()) {
+ query.append(" (c.comp_id.workflowState > ");
+ query.append(EntryLoadRequest.ACTIVE_WORKFLOW_STATE);
+ query.append(" or f.comp_id.workflowState > ");
query.append(EntryLoadRequest.ACTIVE_WORKFLOW_STATE);
+ query.append(")");
} else if (entryLoadRequest.isCurrent()) {
query.append(" c.comp_id.workflowState =3D ");
query.append(EntryLoadRequest.ACTIVE_WORKFLOW_STATE);
- } else if (entryLoadRequest.isStaging()) {
- query.append(" c.comp_id.workflowState > ");
- query.append(EntryLoadRequest.VERSIONED_WORKFLOW_STATE);
} else {
query.append(" c.comp_id.versionId =3D ");
query.append(entryLoadRequest.getVersionID());
}
if (!ignoreLang) {
- query.append(" AND c.comp_id.id=3Df.containerId AND (");
- query.append("f.comp_id.languageCode =3D :languageCode OR f.co=
mp_id.languageCode=3D :sharedLanguageCode ");
- query.append(" ) ");
+ query.append("AND (f.comp_id.languageCode =3D :languageCode OR=
f.comp_id.languageCode=3D :sharedLanguageCode) ");
params.put("languageCode", entryLoadRequest.getFirstLocale(tru=
e)
.toString());
params.put("sharedLanguageCode", ContentField.SHARED_LANGUAGE)=
; =
}
+ if (stagingOnly || entryLoadRequest.isStaging() || !ignoreLang) {
+ query.append(")");
+ } =
}
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
