pvollenweider 2005/03/02 15:01:10 CET
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/etc/struts corporateportal-validation.xml
src/view/jsp/include project.inc
Added files: (Branch: JAHIA-4-1-BRANCH)
src/java/jahiatemplates/org/jahia/corporateportal/validation/beans
ProjectValidationBean.java
Log:
Add validator for project name
Revision Changes Path
1.1.2.3 +5 -0
corporate_portal_templates/src/etc/struts/corporateportal-validation.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/etc/struts/corporateportal-validation.xml.diff?r1=1.1.2.2&r2=1.1.2.3&f=h
1.1.2.1 +16 -0
corporate_portal_templates/src/java/jahiatemplates/org/jahia/corporateportal/validation/beans/ProjectValidationBean.java
(new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/java/jahiatemplates/org/jahia/corporateportal/validation/beans/ProjectValidationBean.java?rev=1.1.2.1&content-type=text/plain
1.1.4.1 +52 -21
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.1.4.1&f=h
Index: corporateportal-validation.xml
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/etc/struts/Attic/corporateportal-validation.xml,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- corporateportal-validation.xml 2 Mar 2005 13:24:36 -0000 1.1.2.2
+++ corporateportal-validation.xml 2 Mar 2005 14:01:09 -0000 1.1.2.3
@@ -28,5 +28,10 @@
<arg0 key="Title" resource="false"/>
</field>
</form>
+ <form name="projectValidationBean">
+ <field property="directoryProjectName" depends="required">
+ <arg0 key="Name" resource="false"/>
+ </field>
+ </form>
</formset>
</form-validation>
\ No newline at end of file
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.1.4.1
diff -u -r1.1 -r1.1.4.1
--- project.inc 28 Oct 2003 22:56:41 -0000 1.1
+++ project.inc 2 Mar 2005 14:01:10 -0000 1.1.4.1
@@ -1,25 +1,56 @@
-<%
-
+<content:declareContainerList name='directoryProjectContainer'
title="Project container"
+
containerBeanName="jahiatemplates.org.jahia.corporateportal.validation.beans.ProjectValidationBean"
+ validatorKey="projectValidationBean">
+ <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>
-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 );
-%>
<jahia:jahiaPageForm name="jahiapageform">
<jahia:containerList name="directoryProjectContainer" title="Project
container" windowSize="5">
<jahia:cListPaginationCurrentPageScrollingValue valueOnly="false" />
