Author: bpapez
Date: Tue Nov 13 11:45:48 2007
New Revision: 19125
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19125&repname=
=3Djahia
Log:
Rather use field.object than field.value for file field validations
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Co=
ntainerValidatorBase.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/contain=
ers/ContainerValidatorBase.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/containers/ContainerValidatorBase.java=
&rev=3D19125&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Co=
ntainerValidatorBase.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/containers/Co=
ntainerValidatorBase.java Tue Nov 13 11:45:48 2007
@@ -22,6 +22,7 @@
import org.jahia.data.fields.FieldTypes;
import org.jahia.data.fields.JahiaContentFieldFacade;
import org.jahia.data.fields.JahiaField;
+import org.jahia.data.files.JahiaFileField;
import org.jahia.engines.JahiaEngine;
import org.jahia.engines.shared.JahiaPageEngineTempBean;
import org.jahia.engines.validation.JahiaMltHelper;
@@ -133,15 +134,13 @@
break;
=
case FieldTypes.FILE:
- if (newJf.getValue() !=3D null
- && newJf.getValue().toUpperCase().inde=
xOf("<EMPTY>") !=3D -1)
- field =3D "";
- else
- field =3D newJf.getValue();
+ field =3D newJf.getObject() !=3D null ? ((Jahi=
aFileField) newJf
+ .getObject()).getRealName()
+ : "";
break;
=
case FieldTypes.APPLICATION:
- field =3D (newJf.getObject() !=3D null ? newJf=
.getObject().toString() : "");
+ field =3D newJf.getObject() !=3D null ? newJf.=
getObject().toString() : "";
break;
=
default:
@@ -227,13 +226,9 @@
break;
=
case FieldTypes.FILE:
- if (newJf.getValue() !=3D null
- && newJf.getValue().toUpperCase().=
indexOf(
- "<EMPTY>") !=3D -1)
- field.addMltItem(newJf.getLanguageCode=
(), "");
- else
- field.addMltItem(newJf.getLanguageCode=
(),
- FormDataManager.removeSpecialT=
ags(newJf.getValue()));
+ field.addMltItem(newJf.getLanguageCode(),
+ newJf.getObject() !=3D null ? ((Ja=
hiaFileField) newJf
+ .getObject()).getRealName(=
) : "");
break;
=
case FieldTypes.APPLICATION:
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
