Author: dpillot
Date: Tue Sep 25 18:43:50 2007
New Revision: 797
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D797&repname=
=3Dcorporate_portal_templates_v2
Log:
changed implementation of group and users containers no longer use of fiel=
ds
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/box.jsp
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/usersContainer.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=3D797&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 Tue Sep 25 18:43:50 20=
07
@@ -94,7 +94,7 @@
<%@ include file=3D"groupsContainer.inc"%>
</c:when>
<c:when test=3D"${boxTypeRealValue =3D=3D pollbox}=
">
- <%@ include file=3D"pollbox.inc"%>
+ <!--%@ include file=3D"pollbox.inc"%-->
</c:when>
<c:otherwise>
<%@ include file=3D"texts.inc"%>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/declarations.inc&rev=3D797&repname=3Dcorporate_portal_t=
emplates_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/declarations.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/declarations.inc Tue Sep 25 18=
:43:50 2007
@@ -223,6 +223,16 @@
type=3D"SmallText"
aliasNames=3D"boxUserName"
/>
+ <content:declareField name=3D'userdisplaylimit'
+ title=3D"userdisplaylimit"
+ type=3D"SharedSmallText"
+ value=3D"5"
+ />
+ <content:declareField name=3D'userquery'
+ title=3D"userquery"
+ type=3D"SharedSmallText"
+ value=3D"*"
+ />
</content:declareContainer>
</content:declareContainerList>
<%//------------Group'sBox-------------------------- %>
@@ -241,10 +251,20 @@
type=3D"SmallText"
aliasNames=3D"boxGroupName"
/>
+ <content:declareField name=3D'groupdisplaylimit'
+ title=3D"userdisplaylimit"
+ type=3D"SharedSmallText"
+ value=3D"5"
+ />
+ <content:declareField name=3D'groupquery'
+ title=3D"userquery"
+ type=3D"SharedSmallText"
+ value=3D"*"
+ />
</content:declareContainer>
</content:declareContainerList>
=
- =
+
<%//------------poll'sBox-------------------------- %>
<content:declareContainerList name=3D'<%=3D"pollbox" + id%>'
title=3D"pollbox Container"
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=3D797&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 Tue Sep 25=
18:43:50 2007
@@ -17,34 +17,42 @@
--%><%
//remove cache on this datas
ContainerTag.disableCache(pageContext);
+
+
+ JahiaContainerList gcontlist =3D jData.containers().getContainerList("=
groupsContainer" + id);
+ JahiaContainer thegboxcontainer =3D null;
+ if (gcontlist.getFullSize() =3D=3D 0) {
+ logger.debug("creating ucontainer");
+ thegboxcontainer =3D new JahiaContainer(0, jData.getProcessingCont=
ext().getJahiaID(), jData.getProcessingContext().getPageID(), gcontlist.get=
ID(), 0, /* rank */gcontlist.getAclID(), gcontlist.getctndefid(), 0, 2);
+ ServicesRegistry.getInstance().getJahiaContainersService().saveCon=
tainer(thegboxcontainer, gcontlist.getID(), jData.getProcessingContext());
+ thegboxcontainer.setLanguageCode(jData.getProcessingContext().getL=
ocale().toString());
+ thegboxcontainer.fieldsStructureCheck(jData.getProcessingContext()=
);
+ } else {
+ thegboxcontainer =3D gcontlist.getContainer(0);
+ }
+
// 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);
- int ID =3D jData.page().getID();
- // declare displaylimit field with def value
- if (!jData.fields().checkDeclared("groupdisplaylimit_" + ID)) {
- jData.fields().declareField("groupdisplaylimit_" + ID, "groupdispl=
aylimit", FieldTypes.SMALLTEXT_SHARED_LANG, "5");
- }
- JahiaField thelimit =3D (JahiaField) jData.fields().getField("groupdis=
playlimit_" + ID);
=
- // declare query field
- if (!jData.fields().checkDeclared("groupquery_" + ID)) {
- jData.fields().declareField("groupquery_" + ID, "groupquery", Fiel=
dTypes.SMALLTEXT_SHARED_LANG, "");
- }
- JahiaField thequery =3D (JahiaField) jData.fields().getField("groupque=
ry_" + ID);
+
+ JahiaField theglimit =3D thegboxcontainer.getField("groupdisplaylimit"=
);
+ JahiaField thegquery =3D thegboxcontainer.getField("groupquery");
=
// to store the values from this page context
if (groupQueryString =3D=3D null) {
- groupQueryString =3D thequery.getValue();
+ groupQueryString =3D thegquery.getValue();
} else {
- thequery.setValue(groupQueryString);
- thequery.save(jParams);
+ thegquery.setValue(groupQueryString);
+ thegquery.setObject(groupQueryString);
+ thegquery.save(jParams);
}
if (gdisplay =3D=3D null || gdisplay.equals("")) {
- gdisplay =3D thelimit.getValue();
+ gdisplay =3D theglimit.getValue();
} else {
- thelimit.setValue(gdisplay);
- thelimit.save(jParams);
+ theglimit.setValue(gdisplay);
+ theglimit.setObject(gdisplay);
+ theglimit.save(jParams);
}
=
// in case of null values
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=3D797&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 Tue Sep 25 =
18:43:50 2007
@@ -17,23 +17,25 @@
--%><%
//remove cache on this datas
ContainerTag.disableCache(pageContext);
+ JahiaContainerList ucontlist =3D jData.containers().getContainerList("=
usersContainer" + id);
+ JahiaContainer theuboxcontainer =3D null;
+ if (ucontlist.getFullSize() =3D=3D 0) {
+ logger.debug("creating ucontainer");
+ theuboxcontainer =3D new JahiaContainer(0, jData.getProcessingCont=
ext().getJahiaID(), jData.getProcessingContext().getPageID(), ucontlist.get=
ID(), 0, /* rank */ucontlist.getAclID(), ucontlist.getctndefid(), 0, 2);
+ ServicesRegistry.getInstance().getJahiaContainersService().saveCon=
tainer(theuboxcontainer, ucontlist.getID(), jData.getProcessingContext());
+ theuboxcontainer.setLanguageCode(jData.getProcessingContext().getL=
ocale().toString());
+ theuboxcontainer.fieldsStructureCheck(jData.getProcessingContext()=
);
+ } else {
+ theuboxcontainer =3D ucontlist.getContainer(0);
+ }
+
+
// the query from the user assumed edit context
String userQueryString =3D request.getParameter("userquery_" + id);
String udisplay =3D request.getParameter("userlistsize_" + id);
- int ID=3DjData.page().getID();
-
=
- // declare displaylimit field
- if(!jData.fields().checkDeclared("userdisplaylimit_"+ID)){
- jData.fields().declareField("userdisplaylimit_"+ID, "userdisplayli=
mit", FieldTypes.SMALLTEXT_SHARED_LANG, "5");
- }
- JahiaField thelimit =3D (JahiaField) jData.fields().getField("userdisp=
laylimit_"+ID);
-
- // declare query field
- if(!jData.fields().checkDeclared("userquery_"+ID)){
- jData.fields().declareField("userquery_"+ID, "userquery", FieldTyp=
es.SMALLTEXT_SHARED_LANG, "");
- }
- JahiaField thequery =3D (JahiaField) jData.fields().getField("userquer=
y_"+ID);
+ JahiaField thelimit =3D theuboxcontainer.getField("userdisplaylimit");
+ JahiaField thequery =3D theuboxcontainer.getField("userquery");
=
// to store and retrieve the query from this page context
if (userQueryString =3D=3D null) {
@@ -41,6 +43,7 @@
} else {
logger.debug("storing value:"+userQueryString);
thequery.setValue(userQueryString);
+ thequery.setObject(userQueryString);
thequery.save(jParams);
}
=
@@ -50,9 +53,12 @@
} else {
logger.debug("storing value:"+udisplay);
thelimit.setValue(udisplay);
+ thequery.setObject(udisplay);
thelimit.save(jParams);
}
=
+
+
// in case of null values
if (userQueryString =3D=3D null || userQueryString.equals("null")) use=
rQueryString =3D "";
if (udisplay =3D=3D null || udisplay.equals("")) udisplay =3D "5";
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
