cmailleux 2005/05/17 14:41:55 CEST
Modified files:
core/src/webapp/jsp/jahia/engines/addcontainer
addcontainer.jsp
core/src/webapp/jsp/jahia/engines/containeredit
containeredit.jsp
core .cvsignore project.xml
Log:
Integrate the commons validator to jahia 45
Revision Changes Path
1.2 +4 -1 jahia/core/.cvsignore
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/.cvsignore.diff?r1=1.1&r2=1.2&f=h
1.51 +10 -3 jahia/core/project.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/project.xml.diff?r1=1.50&r2=1.51&f=h
1.4 +35 -2
jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp.diff?r1=1.3&r2=1.4&f=h
1.3 +3 -1
jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp.diff?r1=1.2&r2=1.3&f=h
Index: addcontainer.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- addcontainer.jsp 17 Dec 2004 16:09:17 -0000 1.3
+++ addcontainer.jsp 17 May 2005 12:41:54 -0000 1.4
@@ -1,5 +1,7 @@
<%@ page language="java" %>
-<%@ page import="org.jahia.utils.*" %>
+<%@ page import="org.jahia.utils.*,
+ org.jahia.engines.validation.ValidationError,
+ org.jahia.engines.validation.EngineValidationHelper" %>
<%@ page import="org.jahia.data.*" %>
<%@ page import="org.jahia.data.fields.*" %>
<%@ page import="org.jahia.data.containers.*" %>
@@ -31,7 +33,7 @@
EngineLanguageHelper elh =
(EngineLanguageHelper)engineMap.get(JahiaEngine.ENGINE_LANGUAGE_HELPER);
JahiaContainer theEditedContainer = (JahiaContainer)
engineMap.get("theContainer" );
String logForm = (String) engineMap.get( "logForm" );
-
+ EngineValidationHelper evh =
(EngineValidationHelper)engineMap.get(JahiaEngine.ENGINE_VALIDATION_HELPER);
%>
<table class="text" width="95%" align="center" border="0" cellspacing="0"
cellpadding="0">
@@ -59,6 +61,37 @@
<% if (theScreen.equals("edit")||theScreen.equals("metadata")) { %>
<jsp:include page="../containeredit/containeredit.jsp" flush="true" />
<% } else { %>
+
+<%
+ HashMap fieldErrors = new HashMap();
+ if ( evh != null && evh.hasErrors() ) {
+%>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<tr>
+ <td align="left"> </td>
+ <td valign="top" width="100%" class="text2" nowrap
align="left"><b><jahia:engineResourceBundle
resourceName="org.jahia.engines.validation.errors.label" /></b></td>
+</tr>
+</table>
+<%
+ ArrayList errors = evh.getErrors();
+ for ( int i=0; i<errors.size(); i++ ){
+ ValidationError ve = (ValidationError)errors.get(i);
+ String msg = ve.getMsgError();
+ Object obj = (Object)ve.getSource();
+ JahiaField errorField = null;
+ String fieldLabel = "?";
+ if ( obj != null && (obj instanceof JahiaField) ){
+ errorField = (JahiaField)obj;
+ fieldLabel =
errorField.getDefinition().getName();
+ if ( msg == null ){
+ msg = "";
+ }
+ fieldErrors.put(new
Integer(errorField.getID()),msg);
+ }
+ }
+ }
+%>
+
<form name="mainForm" method="POST"
action="<%=engineUrl%>&screen=edit&editfid=<%=fieldID.intValue()%>">
<table width="100%" border="0" style="height:100%">
<input type="hidden" name="engine_lang"
value="<%=elh.getCurrentLanguageCode()%>">
Index: containeredit.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- containeredit.jsp 6 Aug 2004 19:39:37 -0000 1.2
+++ containeredit.jsp 17 May 2005 12:41:54 -0000 1.3
@@ -1,5 +1,7 @@
<%@ page language="java" %>
-<%@ page import="org.jahia.utils.*" %>
+<%@ page import="org.jahia.utils.*,
+ org.jahia.engines.validation.EngineValidationHelper,
+ org.jahia.engines.validation.ValidationError" %>
<%@ page import="org.jahia.data.*" %>
<%@ page import="org.jahia.data.fields.*" %>
<%@ page import="org.jahia.data.containers.*" %>
Index: .cvsignore
===================================================================
RCS file: /home/cvs/repository/jahia/core/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Mar 2004 17:19:54 -0000 1.1
+++ .cvsignore 17 May 2005 12:41:55 -0000 1.2
@@ -1,3 +1,6 @@
target
build
-ant.build.properties
\ No newline at end of file
+ant.build.properties
+jahia.iml
+jahia.ipr
+jahia.iws
Index: project.xml
===================================================================
RCS file: /home/cvs/repository/jahia/core/project.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- project.xml 4 May 2005 16:44:29 -0000 1.50
+++ project.xml 17 May 2005 12:41:55 -0000 1.51
@@ -198,6 +198,13 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <id>commons-validator</id>
+ <version>1.1.3</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<!--
<dependency>
<id>dom4j</id>
@@ -527,15 +534,15 @@
<dependency>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
- <version>1.1</version>
+ <version>1.2.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<groupId>struts</groupId>
- <artifactId>struts-legacy</artifactId>
- <version>1.1</version>
+ <artifactId>struts-el</artifactId>
+ <version>1.2.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
