Author: cmailleux
Date: Thu Jun 21 12:35:46 2007
New Revision: 17688
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17688&repname=
=3Djahia
Log:
Recorrection for PORTAL-67
Always compare staging value against active value before saving
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/=
JahiaSmallTextSharedLangField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/fields/JahiaSmallTextSharedLangField.j=
ava&rev=3D17688&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/JahiaS=
mallTextSharedLangField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/fields/JahiaS=
mallTextSharedLangField.java Thu Jun 21 12:35:46 2007
@@ -114,34 +114,28 @@
// -> field already has an aclID
// -> no need to create a new one
=
- //ServicesRegistry.getInstance().getJahiaFieldService().saveField(=
theField, 0, jParams );
final ContentSmallTextSharedLangField contentField =3D (ContentSma=
llTextSharedLangField) ContentField.getField(getID());
=
final String value =3D getValue();
- final String savedValue =3D contentField.getValue(jParams);
+ final String savedValue =3D contentField.getValue(jParams,EntryLoa=
dRequest.CURRENT);
=
- if (((value =3D=3D null && savedValue =3D=3D null) || (value !=3D =
null && getValue().equals(savedValue)))) {
+ final boolean b =3D ((value =3D=3D null && savedValue =3D=3D null)=
|| (value !=3D null && getValue().equals(savedValue)));
+ if (b) {
if ( !contentField.isMetadata() ||
(!this.getDefinition().getName().equals(CoreMetadataCo=
nstant.LAST_CONTRIBUTOR)
&& !this.getDefinition().getName().equals(CoreMetadata=
Constant.LAST_MODIFICATION_DATE)) ){
return true;
}
- }
-
- if (!((value =3D=3D null && savedValue =3D=3D null) || (value !=3D=
null && getValue().equals(savedValue)))) {
+ } else {
jParams.getSessionState().setAttribute("FireContainerUpdated",=
"true");
logger.debug("InvalidateEsiInvalidateEsiInvalidateEsiInvalidat=
eEsiInvalidateEsiInvalidateEsi");
}
-
- logger.debug("getValue(): " + getValue());
- logger.debug("contentField.getValue(jParams): " + contentField.get=
Value(jParams));
- /*
- if (contentField.hasActiveEntries() && getValue() !=3D null && get=
Value().equals(contentField.getValue(jParams))) {
- return true;
- }*/
+ if(logger.isDebugEnabled()) {
+ logger.debug("getValue(): " + value);
+ logger.debug("contentField.getValue(jParams): " + savedValue);
+ }
final EntrySaveRequest saveRequest =3D new EntrySaveRequest(jParam=
s.getUser(), getLanguageCode());
- contentField.setText(getValue(), saveRequest);
- //ServicesRegistry.getInstance().getJahiaSearchService().indexCont=
ainer(this.getctnid(), jParams.getUser());
+ contentField.setText(value, saveRequest);
return true;
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
