cmailleux 2005/10/20 12:03:45 CEST
Modified files:
core/src/java/org/jahia/data/containers
ContainerValidatorBase.java
core/src/java/org/jahia/engines/addcontainer
AddContainer_Engine.java
core/src/webapp/WEB-INF/etc/struts
corporateportal-validation.xml
core/src/webapp/WEB-INF/var/shared_templates
corporate_portal_templates.jar
core/src/webapp/jsp/jahia/engines/addcontainer
addcontainer.jsp
core/src/webapp/jsp/jahia/engines/containeredit
containeredit.jsp
Log:
Correct validation of page field, show error messages on validation
Jira entry #JAHIA-460
Revision Changes Path
1.3 +6 -5
jahia/core/src/java/org/jahia/data/containers/ContainerValidatorBase.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/data/containers/ContainerValidatorBase.java.diff?r1=1.2&r2=1.3&f=h
1.32 +0 -0
jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/addcontainer/AddContainer_Engine.java.diff?r1=1.31&r2=1.32&f=h
1.2 +10 -0
jahia/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml.diff?r1=1.1&r2=1.2&f=h
1.66 +871 -869
jahia/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templates.jar
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/WEB-INF/var/shared_templates/corporate_portal_templates.jar.diff?r1=1.65&r2=1.66&f=h
1.13 +0 -25
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.12&r2=1.13&f=h
1.11 +13 -9
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.10&r2=1.11&f=h
Index: ContainerValidatorBase.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/data/containers/ContainerValidatorBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContainerValidatorBase.java 5 Jul 2005 15:46:00 -0000 1.2
+++ ContainerValidatorBase.java 20 Oct 2005 10:03:37 -0000 1.3
@@ -39,10 +39,10 @@
*/
package org.jahia.data.containers;
-import java.util.*;
-
import org.jahia.data.FormDataManager;
-import org.jahia.data.fields.*;
+import org.jahia.data.fields.FieldTypes;
+import org.jahia.data.fields.JahiaContentFieldFacade;
+import org.jahia.data.fields.JahiaField;
import org.jahia.engines.JahiaEngine;
import org.jahia.engines.shared.JahiaPageEngineTempBean;
import org.jahia.engines.validation.JahiaMltHelper;
@@ -50,7 +50,8 @@
import org.jahia.params.ProcessingContext;
import org.jahia.services.pages.JahiaPage;
import org.jahia.services.version.EntryLoadRequest;
-import org.jahia.utils.LanguageCodeConverters;
+
+import java.util.*;
/**
* Used as the base class for all container validator beans.
@@ -141,7 +142,7 @@
.getTitles(
true));
if (titles != null){
- field = (String)titles.get(languageCode);
+ field = (String)titles.get(languageCode.toString());
}
break;
Index: corporateportal-validation.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/WEB-INF/etc/struts/corporateportal-validation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- corporateportal-validation.xml 17 May 2005 12:41:35 -0000 1.1
+++ corporateportal-validation.xml 20 Oct 2005 10:03:37 -0000 1.2
@@ -41,5 +41,15 @@
<arg0 key="Last Name" resource="false"/>
</field>
</form>
+ <form name="topMenuValidationBean">
+ <field property="topLink" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ </form>
+ <form name="leftMenuValidationBean">
+ <field property="link" depends="required">
+ <arg0 key="Title" resource="false"/>
+ </field>
+ </form>
</formset>
</form-validation>
\ No newline at end of file
Index: corporate_portal_templates.jar
===================================================================
<<Binary file>>
Index: addcontainer.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/addcontainer/addcontainer.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- addcontainer.jsp 7 Oct 2005 16:27:45 -0000 1.12
+++ addcontainer.jsp 20 Oct 2005 10:03:44 -0000 1.13
@@ -61,31 +61,6 @@
<% } %>
<%
- HashMap fieldErrors = new HashMap();
- if (evh != null && evh.hasErrors()) {
-%>
-
-<p class="error"><jahia:engineResourceBundle
resourceName="org.jahia.engines.validation.errors.label"/></p>
-
-<%
- ArrayList errors = evh.getErrors();
- for (int i = 0; i < errors.size(); i++) {
- ValidationError ve = (ValidationError) errors.get(i);
- String msg = ve.getMsgError();
- Object obj = ve.getSource();
- JahiaField errorField;
- 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);
- }
- }
- }
-
if (theScreen.equals("logs")) {
if (logForm != null) { %>
<%=logForm%>
Index: containeredit.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/containeredit/containeredit.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- containeredit.jsp 7 Oct 2005 14:14:31 -0000 1.10
+++ containeredit.jsp 20 Oct 2005 10:03:44 -0000 1.11
@@ -1,13 +1,16 @@
<%@ page language="java" contentType="text/html;charset=UTF-8" %>
-<%@ page import="org.jahia.data.fields.*" %>
-<%@ page import="org.jahia.data.containers.*" %>
-<%@ page import="org.jahia.params.*" %>
-<%@ page import="org.jahia.engines.*" %>
-<%@ page import="org.jahia.services.metadata.*" %>
-<%@ page import="java.util.*" %>
+<%@ page import="org.jahia.data.containers.JahiaContainer" %>
+<%@ page import="org.jahia.data.fields.FieldsEditHelper" %>
+<%@ page import="org.jahia.data.fields.FieldsEditHelperAbstract" %>
+<%@ page import="org.jahia.data.fields.JahiaAllowApplyChangeToAllLangField"
%>
+<%@ page import="org.jahia.engines.EngineLanguageHelper" %>
+<%@ page import="org.jahia.engines.JahiaEngine" %>
<%@ page import="org.jahia.engines.validation.EngineValidationHelper" %>
<%@ page import="org.jahia.engines.validation.ValidationError" %>
<%@ page import="org.jahia.exceptions.JahiaException" %>
+<%@ page import="org.jahia.params.ParamBean"%>
+<%@ page import="org.jahia.services.metadata.FieldDefinition"%>
+<%@ page import="java.util.*"%>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
<jahia:i18n/>
@@ -25,7 +28,7 @@
final JahiaContainer theContainer = (JahiaContainer)
engineMap.get("theContainer");
final FieldsEditHelper feh = (FieldsEditHelper)
engineMap.get(fieldsEditCallingEngineName + "." +
- FieldsEditHelperAbstract.FIELDS_EDIT_HELPER_CONTEXTID);
+
FieldsEditHelperAbstract.FIELDS_EDIT_HELPER_CONTEXTID);
final JahiaField theField = feh.getSelectedField();
final Integer fieldID = new Integer(theField.getID());
@@ -47,7 +50,7 @@
if (evh != null && evh.hasErrors()) {
%>
-<p class="error">There are some validation errors !</p>
+<p class="error"><jahia:engineResourceBundle
resourceName="org.jahia.engines.validation.errors.label"/></p>
<%
final ArrayList errors = evh.getErrors();
@@ -111,7 +114,7 @@
errorMsg = "";
}
boolean isRequired =
("true".equals(aField.getDefinition().getProperty(FieldDefinition.REQUIRED)) &&
- !
"true".equals(aField.getDefinition().getProperty(FieldDefinition.READ_ONLY)));
+ !
"true".equals(aField.getDefinition().getProperty(FieldDefinition.READ_ONLY)));
if (isRequired) {
requiredIcon = "<span
class=\"required\">*</span>";
}
@@ -168,6 +171,7 @@
<%} else { %>
<% } %>
<% } %>
+ <p class="error"><%=(errorMsg!=null)?errorMsg:""%></p>
<%=fieldForm%>
<% } %>
<% } %>
