pvollenweider 2005/03/03 14:56:08 CET
Modified files:
src/view/jsp/include project.inc
Log:
On non-edit mode, display a project only if directoryProjectName is non empty.
It use the new COMP_NOT_EQUAL constant.
Revision Changes Path
1.2 +60 -20
corporate_portal_templates/src/view/jsp/include/project.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/project.inc.diff?r1=1.1&r2=1.2&f=h
Index: project.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/project.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ project.inc 3 Mar 2005 13:56:08 -0000 1.2
@@ -1,25 +1,65 @@
<%
-
-
-jData.containers().declareField( "directoryProjectName",
ResourceBundleMarker.drawMarker(resBundleID, "name","Name"),
FieldTypes.SMALLTEXT, "" );
-jData.containers().declareField( "directoryProjectDescription",
ResourceBundleMarker.drawMarker(resBundleID, "description","Description"),
FieldTypes.SMALLTEXT, "" );
-jData.containers().declareField( "directoryProjectCategory",
ResourceBundleMarker.drawMarker(resBundleID, "category","Category"),
FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue[" +
projectCategoriesValues.toString() + "]>" );
-jData.containers().declareField( "directoryProjectBudget",
ResourceBundleMarker.drawMarker(resBundleID, "budget","Budget"),
FieldTypes.SMALLTEXT_SHARED_LANG, "" );
-jData.containers().declareField( "directoryProjectStart",
ResourceBundleMarker.drawMarker(resBundleID, "startDate","Start date"),
FieldTypes.DATE, "<jahia_calendar[dd.mm.yyyy]>" );
-jData.containers().declareField( "directoryProjectEnd",
ResourceBundleMarker.drawMarker(resBundleID, "endDate","End date"),
FieldTypes.DATE, "<jahia_calendar[dd.mm.yyyy]>" );
-jData.containers().declareField( "directoryProjectPage",
ResourceBundleMarker.drawMarker(resBundleID, "projectPage","Project page"),
FieldTypes.PAGE, "<jahia_linkonly>" );
-
-
-Vector directoryProjectFields = new Vector();
-directoryProjectFields.add( "directoryProjectName" );
-directoryProjectFields.add( "directoryProjectDescription" );
-directoryProjectFields.add( "directoryProjectCategory" );
-directoryProjectFields.add( "directoryProjectBudget" );
-directoryProjectFields.add( "directoryProjectStart" );
-directoryProjectFields.add( "directoryProjectEnd" );
-directoryProjectFields.add( "directoryProjectPage" );
-jData.containers().declareContainer( "directoryProjectContainer", "Project
container", directoryProjectFields );
+// on live mode, create filters to return pages without empty name
+if (! jData.gui().isEditMode()) {
+ Vector containerFilterVector = new Vector();
+ ContainerFilterBean directoryProjectContainerFilter = new
ContainerFilterBean("directoryProjectName",jParams.getEntryLoadRequest());
+
directoryProjectContainerFilter.addClause(ContainerFilterBean.COMP_NOT_EQUAL,"");
+ containerFilterVector.add(directoryProjectContainerFilter);
+ ContainerFilters directoryProjectContainerFilters = new
ContainerFilters("directoryProjectContainer", jParams, containerFilterVector);
+
request.setAttribute("directoryProjectContainer_filter_handler",directoryProjectContainerFilters);
+}
%>
+<content:declareContainerList name='directoryProjectContainer'
title="Project container">
+ <content:declareContainer>
+ <content:declareField name='directoryProjectName'
+ title="Name"
+ titleKey="name"
+ bundleKey="<%=resBundleID%>"
+ type="SmallText"
+ />
+ <content:declareField name="directoryProjectDescription"
+ title="Description"
+ titleKey="description"
+ bundleKey="<%=resBundleID%>"
+ type="SmallText"
+ />
+ <content:declareField name="directoryProjectCategory"
+ title="Category"
+ titleKey="category"
+ bundleKey="<%=resBundleID%>"
+ type="SharedSmallText"
+ value='<%="<jahia_multivalue[" +
projectCategoriesValues.toString() + "]>"%>'
+ />
+ <content:declareField name="directoryProjectBudget"
+ title="Budget"
+ titleKey="budget"
+ bundleKey="<%=resBundleID%>"
+ type="SharedSmallText"
+ />
+ <content:declareField name="directoryProjectStart"
+ title="Start date"
+ titleKey="startDate"
+ bundleKey="<%=resBundleID%>"
+ type="Date"
+ value="<jahia_calendar[dd.mm.yyyy]>"
+ />
+ <content:declareField name='directoryProjectEnd'
+ title="End date"
+ titleKey="endDate"
+ bundleKey="<%=resBundleID%>"
+ type="Date"
+ value="<jahia_calendar[dd.mm.yyyy]>"
+ />
+ <content:declareField name='directoryProjectPage'
+ title="Project page"
+ titleKey="projectPage"
+ bundleKey="<%=resBundleID%>"
+ type="Page"
+ value="<jahia_linkonly>"
+ />
+ </content:declareContainer>
+</content:declareContainerList>
+
<jahia:jahiaPageForm name="jahiapageform">
<jahia:containerList name="directoryProjectContainer" title="Project
container" windowSize="5">
<jahia:cListPaginationCurrentPageScrollingValue valueOnly="false" />
