Author: knguyen
Date: Thu Aug 16 14:55:16 2007
New Revision: 759
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D759&repname=
=3Dcorporate_portal_templates_v2
Log:
fix saved search and container cache
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/box.jsp&rev=3D759&repname=3Dcorporate_portal_templates_=
v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/jsp/box/box.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp Thu Aug 16 14:55:16 20=
07
@@ -21,7 +21,7 @@
<content:containerList name=3D'<%=3D"boxContainer" + id%>' id=3D"boxContai=
nerList">
<jahiaHtml:actionMenu name=3D"boxContainerList" namePostFix=3D".boxCon=
tainers"
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"><b=
r/>
- <content:container id=3D"boxContainer" cacheKey=3D'<%=3D"boxContai=
ner" + id%>'>
+ <content:container id=3D"boxContainer">
<content:textField name=3D'boxType' valueId=3D"boxTypeValue" d=
isplay=3D'false' defaultValue=3D'texts'/>
=
<bean:define id=3D"files" value=3D'<%=3DResourceBundleMarke=
r.getValue(ResourceBundleMarker.drawMarker(resBundleID,"files",""),jParams.=
getLocale())%>'/>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/savedsearch.inc&rev=3D759&repname=3Dcorporate_portal_te=
mplates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/savedsearch.inc Thu Aug 16 14:=
55:16 2007
@@ -16,12 +16,7 @@
limitations under the License.
--%><bean:parameter id=3D"displayDetails" name=3D"displayDetails" value=3D=
"false"/>
<content:containerList name=3D'<%=3D"savedSearch" + id%>' id=3D"savedSearc=
h" parentContainerName=3D"boxContainer">
-<<<<<<< .mine
- <content:container-cache cacheKey=3D'<%=3D"boxContainer" + id%>'/>
- <content:container id=3D"savedSearchContainer" cache=3D"false">
-=3D=3D=3D=3D=3D=3D=3D
<content:container id=3D"savedSearchContainer" cache=3D"off">
->>>>>>> .r757
<jahiaHtml:actionMenu name=3D"savedSearchContainer" namePostFix=3D=
".savedSearch"
resourceBundle=3D"jahiatemplates.Corporate_portal_templates_v2"
useFieldSet=3D"true">
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
