Author: knguyen
Date: Tue May 15 12:51:52 2007
New Revision: 17305
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17305&repname=
=3Djahia
Log:
fix SIACG-3 : complete fix
Modified:
branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/categories/Ca=
tegoriesSelect_Engine.java
branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/search/Webdav=
SearchDelegate.java
branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/var/shared_templates/=
corporate_portal_templates_v2.jar
branches/JAHIA-ACG-BRANCH/core/src/webapp/jsp/jahia/engines/shared/clos=
e.jsp
Modified: branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/categor=
ies/CategoriesSelect_Engine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/java/org/jahia/engines/categories/CategoriesSelect_Engine.jav=
a&rev=3D17305&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
--- branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/categories/Ca=
tegoriesSelect_Engine.java (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/categories/Ca=
tegoriesSelect_Engine.java Tue May 15 12:51:52 2007
@@ -165,12 +165,16 @@
theSession.setAttribute("contextId", contextId);
}
=
+ String jsInputName =3D jParams.getParameter("jsInputName");
+ if ( jsInputName !=3D null && !"".equals(jsInputName.trim()) ){
+ engineMap.put("jsInputName",jsInputName);
+ }
engineMap.put(RENDER_TYPE_PARAM, new Integer(JahiaEngine.RENDERTYP=
E_FORWARD));
engineMap.put(ENGINE_NAME_PARAM, ENGINE_NAME);
engineMap.put(ENGINE_URL_PARAM, jParams.composeEngineUrl(ENGINE_NA=
ME, ""));
engineMap.put("noApply", "");
theSession.setAttribute("jahia_session_engineMap", engineMap);
-
+ engineMap.put("refreshOpener","no");
// sets screen
engineMap.put("screen", theScreen);
if (theScreen.equals("save")) {
@@ -225,6 +229,12 @@
defaultSelectedCategories =3D new ArrayList();
}
=
+ String resetCategory =3D jParams.getParameter("reset");
+ if ( "true".equals(resetCategory) ){
+ defaultSelectedCategories =3D new ArrayList();
+ categoriesDataMap.put("defaultSelectedCategories",defaultSelec=
tedCategories);
+ }
+
boolean foundNoSelectionMarker =3D false;
=
if (selectedCategories =3D=3D null) {
@@ -296,6 +306,18 @@
categoriesDataMap.put("defaultSelectedCategories", selectedCat=
egories);
categoriesDataMap.put("updated", Boolean.TRUE);
jParams.getSessionState().setAttribute(ENGINE_NAME + ".categor=
iesDataMap." + contextId, categoriesDataMap);
+ String jsInputName =3D (String)engineMap.get("jsInputName");
+ if ( jsInputName !=3D null && !"".equals(jsInputName.trim()) ){
+ Iterator it =3D selectedCategories.iterator();
+ StringBuffer buff =3D new StringBuffer();
+ while ( it.hasNext() ){
+ buff.append(it.next().toString());
+ if ( it.hasNext() ){
+ buff.append(",");
+ }
+ }
+ engineMap.put("jsInputValue",buff.toString());
+ }
}
=
jParams.getSessionState().removeAttribute(Category_Field.ORIGINALL=
YSELECTEDCATEGORIES_ENGINEMAPKEY + contextId);
Modified: branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/search/=
WebdavSearchDelegate.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/java/org/jahia/engines/search/WebdavSearchDelegate.java&rev=
=3D17305&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
--- branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/search/Webdav=
SearchDelegate.java (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/java/org/jahia/engines/search/Webdav=
SearchDelegate.java Tue May 15 12:51:52 2007
@@ -359,6 +359,10 @@
}
if ( webdavSearchFormSubmit ){
this.setCategoriesValues(propDef.getName(),StringEscap=
eUtils.escapeHtml(value));
+ String propDefName =3D propDef.getNamespace()+"@"+prop=
Def.getName();
+ String contextId =3D this.getSearchViewHandler().getCo=
ntextId() + "_" + propDefName;
+ jParams.getSessionState().removeAttribute(CategoriesSe=
lect_Engine.ENGINE_NAME
+ +".categoriesDataMap."+contextId);
}
value =3D jParams.getParameter("subCategoriesEnabled_" + p=
ropDef.getName());
if ( webdavSearchFormSubmit ){
@@ -369,6 +373,7 @@
}
}
}
+ this.handleCategories(jParams,true);
=
String[] values =3D jParams.getParameterValues(WEBDAV_LOCATION=
);
if ( values !=3D null ){
@@ -402,8 +407,6 @@
=
}
=
- this.handleCategories(jParams,true);
-
buildWebdavQuery(jParams);
}
=
@@ -710,7 +713,18 @@
}
}
if ( clauseAdded ){
- ((AndExpression)searchRequest.getWhereExpression()).ad=
d(orExpression);
+ boolean moreThan2Clauses =3D false;
+ Iterator expIt =3D orExpression.getExpressions();
+ if ( expIt.hasNext() ){
+ expIt.next();
+ moreThan2Clauses =3D expIt.hasNext();
+ }
+ if ( moreThan2Clauses ){
+ ((AndExpression)searchRequest.getWhereExpression()=
).add(orExpression);
+ } else {
+ ((AndExpression)searchRequest.getWhereExpression())
+ .add((CompareExpression)orExpression.getEx=
pressions().next());
+ }
}
}
}
Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/WEB-INF/var/shared_temp=
lates/corporate_portal_templates_v2.jar
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_template=
s_v2.jar&rev=3D17305&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
Binary files - no diff available.
Modified: branches/JAHIA-ACG-BRANCH/core/src/webapp/jsp/jahia/engines/share=
d/close.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-ACG-BR=
ANCH/core/src/webapp/jsp/jahia/engines/shared/close.jsp&rev=3D17305&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
--- branches/JAHIA-ACG-BRANCH/core/src/webapp/jsp/jahia/engines/shared/clos=
e.jsp (original)
+++ branches/JAHIA-ACG-BRANCH/core/src/webapp/jsp/jahia/engines/shared/clos=
e.jsp Tue May 15 12:51:52 2007
@@ -44,12 +44,29 @@
refreshOpener =3D (String) engineMap.get("refreshOpener");
}
JahiaContainer theContainer =3D (JahiaContainer) engineMap.get("theCon=
tainer");
+ String jsInputName =3D (String)engineMap.get("jsInputName");
+ String jsInputValue =3D (String)engineMap.get("jsInputValue");
+ if ( jsInputValue =3D=3D null ){
+ jsInputValue =3D "";
+ }
%>
=
<script type=3D"text/javascript">
=
window.onunload =3D function () {
}
+ =
+ <%
+ if ( jsInputName !=3D null ){
+ %>
+ function setJSInput(){
+ window.opener.document.getElementById('<%=3DjsInputName%>').value =
=3D '<%=3DjsInputValue%>';
+ }
+ setJSInput();
+ <%
+ }
+ %>
+
<% if ( !addNew ){ %>
<% if ("close".equals(theScreen)) { %>
window.close();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
