Commit d12b7074 authored by Guillaume Lépine's avatar Guillaume Lépine
Browse files

FORMS-722: Fix Pattern validator

parent 0b1dc3b9
...@@ -37,6 +37,7 @@ import java.util.HashMap; ...@@ -37,6 +37,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import fr.paris.lutece.plugins.forms.business.Control; import fr.paris.lutece.plugins.forms.business.Control;
...@@ -112,15 +113,19 @@ public abstract class AbstractPatternValidator extends AbstractValidator ...@@ -112,15 +113,19 @@ public abstract class AbstractPatternValidator extends AbstractValidator
if ( regularExpression != null ) if ( regularExpression != null )
{ {
IRegularExpressionService service = SpringContextService.getBean( BEAN_NAME_REGULAR_EXPRESSION ); IRegularExpressionService service = SpringContextService.getBean( BEAN_NAME_REGULAR_EXPRESSION );
if ( CollectionUtils.isEmpty( questionResponse.getEntryResponse( ) ) )
{
return !questionResponse.getQuestion( ).getEntry( ).isMandatory( );
}
for ( Response response : questionResponse.getEntryResponse( ) ) for ( Response response : questionResponse.getEntryResponse( ) )
{ {
String toValidate = getValueToValidate( response ); String toValidate = getValueToValidate( response );
if ( StringUtils.isNotEmpty( toValidate ) ) if ( StringUtils.isNotEmpty( toValidate ) && !service.isMatches( toValidate, regularExpression ) )
{ {
return service.isMatches( toValidate, regularExpression ); return false;
} }
} }
return !questionResponse.getQuestion( ).getEntry( ).isMandatory( ); return true;
} }
return false; return false;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment