Author: dpillot
Date: Fri Sep 21 18:26:44 2007
New Revision: 788
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D788&repname=
=3Dcorporate_portal_templates_v2
Log:
added cache management on user box and group box
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/groupsContainer.inc&rev=3D788&repname=3Dcorporate_porta=
l_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/groupsContainer.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc Fri Sep 21=
18:26:44 2007
@@ -15,6 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><%
+ //remove cache on this datas
+ ContainerTag.disableCache(pageContext);
// the query from the user's request in an edit context
String groupQueryString =3D request.getParameter("groupquery_" + id);
String gdisplay =3D request.getParameter("grouplistsize_" + id);
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/usersContainer.inc&rev=3D788&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/usersContainer.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.inc Fri Sep 21 =
18:26:44 2007
@@ -1,3 +1,78 @@
+<%@ page import=3D"org.compass.core.CompassHighlighter" %>
+<%@ page import=3D"org.jahia.ajax.usersession.userSettings" %>
+<%@ page import=3D"org.jahia.content.ContentObject" %>
+<%@ page import=3D"org.jahia.content.ContentSorterByMetadata" %>
+<%@ page import=3D"org.jahia.content.ObjectKey" %>
+<%@ page import=3D"org.jahia.content.PageReferenceableInterface" %>
+<%@ page import=3D"org.jahia.data.FormDataManager" %>
+<%@ page import=3D"org.jahia.data.JahiaData" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerBean" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerListBean" %>
+<%@ page import=3D"org.jahia.data.beans.PageBean" %>
+<%@ page import=3D"org.jahia.data.containers.*" %>
+<%@ page import=3D"org.jahia.data.fields.FieldTypes" %>
+<%@ page import=3D"org.jahia.data.fields.JahiaDateFieldUtil" %>
+<%@ page import=3D"org.jahia.data.fields.JahiaField" %>
+<%@ page import=3D"org.jahia.data.files.JahiaFileField" %>
+<%@ page import=3D"org.jahia.data.search.JahiaSearchHit" %>
+<%@ page import=3D"org.jahia.data.search.JahiaSearchHitInterface" %>
+<%@ page import=3D"org.jahia.data.search.JahiaSearchResult" %>
+<%@ page import=3D"org.jahia.data.search.JahiaSearchResultSorter" %>
+<%@ page import=3D"org.jahia.engines.mysettings.MySettingsEngine" %>
+<%@ page import=3D"org.jahia.engines.search.*" %>
+<%@ page import=3D"org.jahia.exceptions.JahiaException" %>
+<%@ page import=3D"org.jahia.gui.GuiBean" %>
+<%@ page import=3D"org.jahia.hibernate.manager.JahiaObjectDelegate" %>
+<%@ page import=3D"org.jahia.hibernate.manager.JahiaObjectManager" %>
+<%@ page import=3D"org.jahia.hibernate.manager.SpringContextSingleton" %>
+<%@ page import=3D"org.jahia.layout.PortletBean" %>
+<%@ page import=3D"org.jahia.layout.PortletBeanSet" %>
+<%@ page import=3D"org.jahia.layout.PortletBeanSpanningGrid" %>
+<%@ page import=3D"org.jahia.layout.PortletSetPersistanceManager" %>
+<%@ page import=3D"org.jahia.params.ParamBean" %>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
+<%@ page import=3D"org.jahia.resourcebundle.JahiaResourceBundle" %>
+<%@ page import=3D"org.jahia.resourcebundle.ResourceBundleMarker" %>
+<%@ page import=3D"org.jahia.security.license.LicenseActionChecker" %>
+<%@ page import=3D"org.jahia.services.acl.JahiaACLManagerService" %>
+<%@ page import=3D"org.jahia.services.categories.Category" %>
+<%@ page import=3D"org.jahia.services.containers.ContentContainer" %>
+<%@ page import=3D"org.jahia.services.containers.ContentContainerList" %>
+<%@ page import=3D"org.jahia.services.fields.ContentPageField" %>
+<%@ page import=3D"org.jahia.services.metadata.CoreMetadataConstant" %>
+<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
+<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
+<%@ page import=3D"org.jahia.services.pages.PageInfoInterface" %>
+<%@ page import=3D"org.jahia.services.search.JahiaSearchConstant" %>
+<%@ page import=3D"org.jahia.services.search.NumberPadding" %>
+<%@ page import=3D"org.jahia.services.search.PageSearchResultBuilderImpl" =
%>
+<%@ page import=3D"org.jahia.services.search.SearchHandler" %>
+<%@ page import=3D"org.jahia.services.search.savedsearch.JahiaSavedSearch"=
%>
+<%@ page import=3D"org.jahia.services.sites.JahiaSite" %>
+<%@ page import=3D"org.jahia.services.usermanager.JahiaUser" %>
+<%@ page import=3D"org.jahia.services.usermanager.UserProperty" %>
+<%@ page import=3D"org.jahia.services.version.EntryLoadRequest" %>
+<%@ page import=3D"org.jahia.services.webdav.JahiaWebdavBaseService" %>
+<%@ page import=3D"org.jahia.services.workflow.WorkflowService" %>
+<%@ page import=3D"org.jahia.taglibs.ajax.ComplexTreeInclude" %>
+<%@ page import=3D"org.jahia.taglibs.container.ContainerTag" %>
+<%@ page import=3D"org.jahia.utils.JahiaTools" %>
+<%@ page import=3D"javax.servlet.http.HttpServletRequest" %>
+<%@ page import=3D"java.lang.Boolean" %>
+<%@ page import=3D"java.lang.Exception" %>
+<%@ page import=3D"java.lang.Float" %>
+<%@ page import=3D"java.lang.Integer" %>
+<%@ page import=3D"java.lang.Long" %>
+<%@ page import=3D"java.lang.Math" %>
+<%@ page import=3D"java.lang.NumberFormatException" %>
+<%@ page import=3D"java.lang.Object" %>
+<%@ page import=3D"java.lang.String" %>
+<%@ page import=3D"java.lang.StringBuffer" %>
+<%@ page import=3D"java.lang.System" %>
+<%@ page import=3D"java.lang.Throwable" %>
+<%@ page import=3D"java.text.Format" %>
+<%@ page import=3D"java.text.SimpleDateFormat" %>
+<%@ page import=3D"java.util.*" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -15,6 +90,8 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><%
+ //remove cache on this datas
+ ContainerTag.disableCache(pageContext);
// the query from the user assumed edit context
String userQueryString =3D request.getParameter("userquery_" + id);
String udisplay =3D request.getParameter("userlistsize_" + id);
@@ -73,9 +150,10 @@
</script>
=
<%
+
if (! jData.gui().isEditMode()) {
%>
-<!--udisp:<%=3Dudisplay%>uquery:<%=3DuserQueryString%><br/><br/> -->
+udisp:<%=3Dudisplay%>uquery:<%=3DuserQueryString%><br/><br/>
<!-- the scope is everywhere jahiaDB+LDAP if available -->
<jahiaHtml:userList displayLimit=3D"<%=3DInteger.parseInt(udisplay)%>" que=
ry=3D"<%=3DuserQueryString%>" scope=3D"all" backCall=3D"javascript:openWind=
owDetail(userid,'u',480,480);" styleClass=3D""/>
<%
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/common/declarations.inc&rev=3D788&repname=3Dcorporate_porta=
l_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/common/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/common/declarations.inc Fri Sep 21=
18:26:44 2007
@@ -66,7 +66,13 @@
org.apache.lucene.queryParser.QueryParser,
org.jahia.taglibs.esi.JesiConst,
jahiatemplates.org.jahia.corporateportalv2.search.*,
- org.jahia.ajax.usersession.userSettings"
+ org.jahia.ajax.usersession.userSettings,
+ org.jahia.services.acl.JahiaBaseACL,
+ org.jahia.services.acl.JahiaACLEntry,
+ org.jahia.services.usermanager.JahiaGroupManagerService,
+ org.jahia.services.usermanager.JahiaUserManagerService,
+ org.jahia.taglibs.container.ContainerTag
+ "
%><%@ taglib uri=3D"/WEB-INF/etc/struts/struts-bean" prefix=3D"bean" %><%@
taglib uri=3D"/WEB-INF/etc/struts/struts-html" prefix=3D"html" %><%@
taglib uri=3D"/WEB-INF/etc/struts/struts-logic" prefix=3D"logic" %><%@
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
