cvs commit: jahia/core/src/java/org/jahia/engines/validation EngineValidationHelper.java

[Xavier Lawrence]

xlawrence    2006/01/02 15:29:59 CET

  Modified files:
    core/src/java/org/jahia/engines/validation 
                                               EngineValidationHelper.java 
  Log:
  fix for JAHIA-618
  test if the depends property of the field is set to "required"
  
  Revision  Changes    Path
  1.7       +4 -2      
jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: EngineValidationHelper.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/validation/EngineValidationHelper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- EngineValidationHelper.java       15 Dec 2005 15:01:18 -0000      1.6
  +++ EngineValidationHelper.java       2 Jan 2006 14:29:59 -0000       1.7
  @@ -123,6 +123,8 @@
                                              final ProcessingContext jParams) 
throws JahiaException {
           if (parentContainer == null || theField == null) return false;
   
  +        final String fieldName = theField.getDefinition().getName();
  +
           final JahiaContainerDefinition def = parentContainer.getDefinition();
           if (def == null) return false;
   
  @@ -144,9 +146,9 @@
               final Form form = vr.getForm(jParams.getLocale(), validatorKey);
               logger.debug("Form: " + form);
               if (form == null) return false;
  -            final Field f = 
form.getField(theField.getDefinition().getName());
  +            final Field f = form.getField(fieldName);
               if (f == null) return false;
  -            return theField.getDefinition().getName().equals(f.getKey());
  +            return f.getDepends().equals("required") && 
fieldName.equals(f.getKey());
           }
           return false;
       }