Author: xlawrence
Date: Tue Jul 10 11:24:36 2007
New Revision: 17929
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17929&repname=
=3Djahia
Log:
Do not block validation on integrity errors if the cause will be resolved d=
uring the current batch validation.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentBigTextField.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fie=
lds/ContentBigTextField.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/fields/ContentBigTextField.java&re=
v=3D17929&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/services/fields/Co=
ntentBigTextField.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/fields/Co=
ntentBigTextField.java Tue Jul 10 11:24:36 2007
@@ -18,6 +18,7 @@
package org.jahia.services.fields;
=
import org.jahia.content.ContentFieldKey;
+import org.jahia.content.ContentPageKey;
import org.jahia.data.ConnectionTypes;
import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.fields.JahiaBigTextField;
@@ -297,26 +298,32 @@
try {
page =3D ContentPage.getPage(pid);
} catch (JahiaPageNotFoundException e) {
- final EngineMessage msg =3D new EngineMessage(
- "org.jahia.engines.shared.BigText_Fiel=
d.notExistingWarning",
- Integer.toString(pid));
- final URLIntegrityValidForActivationResults ac=
tivationResults =3D
- new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
- getID(), jParams.getLocale().t=
oString(),
- msg);
- results.appendError(activationResults);
+ final ContentPageKey key =3D new ContentPageKe=
y(pid);
+ if (! stateModifContext.isModifiedObject(key))=
{
+ final EngineMessage msg =3D new EngineMess=
age(
+ "org.jahia.engines.shared.BigText_=
Field.notExistingWarning",
+ Integer.toString(pid));
+ final URLIntegrityValidForActivationResult=
s activationResults =3D
+ new URLIntegrityValidForActivation=
Results(ContentFieldKey.FIELD_TYPE,
+ getID(), jParams.getLocale=
().toString(),
+ msg);
+ results.appendError(activationResults);
+ }
continue;
}
=
if (page =3D=3D null) {
- final EngineMessage msg =3D new EngineMessage(
- "org.jahia.engines.shared.BigText_Fiel=
d.notExistingWarning",
- Integer.toString(pid));
- final URLIntegrityValidForActivationResults ac=
tivationResults =3D
- new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
- getID(), jParams.getLocale().t=
oString(),
- msg);
- results.appendError(activationResults);
+ final ContentPageKey key =3D new ContentPageKe=
y(pid);
+ if (! stateModifContext.isModifiedObject(key))=
{
+ final EngineMessage msg =3D new EngineMess=
age(
+ "org.jahia.engines.shared.BigText_=
Field.notExistingWarning",
+ Integer.toString(pid));
+ final URLIntegrityValidForActivationResult=
s activationResults =3D
+ new URLIntegrityValidForActivation=
Results(ContentFieldKey.FIELD_TYPE,
+ getID(), jParams.getLocale=
().toString(),
+ msg);
+ results.appendError(activationResults);
+ }
continue;
}
=
@@ -348,7 +355,8 @@
continue;
}
if ("staging".equals(state)) {
- if (page.getActiveVersionID() <=3D 0) {
+ final ContentPageKey key =3D new ContentPageKe=
y(pid);
+ if (page.getActiveVersionID() <=3D 0 && ! stat=
eModifContext.isModifiedObject(key)) {
final EngineMessage msg =3D new EngineMess=
age(
"org.jahia.engines.shared.BigText_=
Field.stagingWarning",
Integer.toString(pid));
@@ -370,7 +378,8 @@
results.appendError(activationResults);
=
} else if ("waiting".equals(state)) {
- if (page.getActiveVersionID() <=3D 0) {
+ final ContentPageKey key =3D new ContentPageKe=
y(pid);
+ if (page.getActiveVersionID() <=3D 0 && ! stat=
eModifContext.isModifiedObject(key)) {
final EngineMessage msg =3D new EngineMess=
age(
"org.jahia.engines.shared.BigText_=
Field.approvalWarning",
Integer.toString(pid));
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
