Author: knguyen
Date: Fri Oct 5 15:25:26 2007
New Revision: 18763
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18763&repname=
=3Djahia
Log:
JAHIA-2449 : fix Date field value format on Apply action.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaD=
ateField.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Dat=
e_Field.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaDateField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaDateField.java&rev=3D18763=
&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/fields/JahiaD=
ateField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaD=
ateField.java Fri Oct 5 15:25:26 2007
@@ -142,6 +142,9 @@
}
=
public boolean save(ProcessingContext jParams) throws JahiaException {
+
+ String oldValue =3D this.fieldValue;
+
setValue((String) getObject());
//System.out.println("########### Save - Value: "+theField.getValu=
e());
// 0 for parentAclID in saveField, because field already exists
@@ -181,6 +184,8 @@
// this.getctnid(), jParams.getUser());
} catch (Throwable t) {
t.printStackTrace();
+ // restore all value
+ this.setValue(oldValue);
return false;
}
return true;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shar=
ed/Date_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/shared/Date_Field.java&rev=3D18763&=
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/engines/shared/Dat=
e_Field.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/shared/Dat=
e_Field.java Fri Oct 5 15:25:26 2007
@@ -27,10 +27,7 @@
import org.jahia.data.ConnectionTypes;
import org.jahia.data.FormDataManager;
import org.jahia.data.containers.JahiaContainer;
-import org.jahia.data.fields.FieldsEditHelper;
-import org.jahia.data.fields.FieldsEditHelperAbstract;
-import org.jahia.data.fields.JahiaField;
-import org.jahia.data.fields.JahiaFieldDefinitionProperties;
+import org.jahia.data.fields.*;
import org.jahia.engines.EngineMessages;
import org.jahia.engines.EngineParams;
import org.jahia.engines.JahiaEngine;
@@ -167,7 +164,11 @@
if (logger.isDebugEnabled()) {
logger.debug("Saving Field " + theField.getDefinition().getNam=
e() + " : " + theField.getValue() );
}
- return theField.save(jParams);
+ boolean result =3D theField.save(jParams);
+ if ( result =3D=3D true ){
+ theField.load(LoadFlags.ALL,jParams);
+ }
+ return result;
} // end saveData
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
