Author: xlawrence
Date: Wed Jun 27 16:37:46 2007
New Revision: 17809
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17809&repname=
=3Djahia
Log:
backport improvement and fixes on error display in workflow report
Modified:
trunk/core/src/java/org/jahia/services/fields/ContentBigTextField.java
Modified: trunk/core/src/java/org/jahia/services/fields/ContentBigTextField=
.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/fields/ContentBigTextField.java&rev=3D17809&repname=3Djah=
ia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/fields/ContentBigTextField.java =
(original)
+++ trunk/core/src/java/org/jahia/services/fields/ContentBigTextField.java =
Wed Jun 27 16:37:46 2007
@@ -252,20 +252,22 @@
final StateModificationContext stateModifContext)
throws JahiaException {
=
- logger.debug("isContentValidForActivation: (ID =3D " + getID() + "=
)" + =
- languageCodes + ", lang States =3D " + getLanguagesStates(=
));
+ logger.debug("isContentValidForActivation: (ID =3D " + getID() + "=
)" + languageCodes);
=
final ActivationTestResults results =3D new ActivationTestResults(=
);
- Iterator iterator =3D getLanguagesStates().keySet().iterator();
- if (!iterator.hasNext()) {
+ final JahiaSite site =3D ServicesRegistry.getInstance().
+ getJahiaSitesService().getSite(jParams.getSiteID());
+
+ if (site.getWAIComplianceCheck() + site.getURLIntegrityCheck() =3D=
=3D 0) {
return results;
}
- final Locale bigTextLocale =3D LanguageCodeConverters.languageCode=
ToLocale((String)iterator.next());
=
final List currentLocales =3D jParams.getLocales();
final Locale currentLocale =3D jParams.getLocale();
-
- final ArrayList locales =3D new ArrayList();
+ final Iterator iterator =3D getLanguagesStates().keySet().iterator=
();
+ while (iterator.hasNext()) {
+ final Locale bigTextLocale =3D LanguageCodeConverters.language=
CodeToLocale((String) iterator.next());
+ final List locales =3D new Vector();
// locales.add(new Locale(ContentField.SHARED_LANGUAGE));
locales.add(bigTextLocale);
jParams.getEntryLoadRequest().setLocales(locales);
@@ -276,18 +278,11 @@
=
if (theField =3D=3D null) {
logger.debug("theField is null...");
-
- jParams.getEntryLoadRequest().setLocales(currentLocales);
- jParams.setCurrentLocale(currentLocale);
-
- return results;
+ continue;
}
=
logger.debug("getInternalLinks :" + theField.getInternalLinks());
=
- final JahiaSite site =3D ServicesRegistry.getInstance().
- getJahiaSitesService().getSite(jParams.getSiteID());
- =
if (site.getURLIntegrityCheck() =3D=3D 1) { =
try {
final Iterator pids =3D theField.getInternalLinks().iterat=
or();
@@ -300,8 +295,8 @@
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.no=
tExistingWarning",
Integer.toString(pid));
- final IsValidForActivationResults activationResult=
s =3D
- new IsValidForActivationResults(ContentFie=
ldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResults ac=
tivationResults =3D
+ new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(), =
msg);
results.appendError(activationResults);
@@ -312,8 +307,8 @@
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.no=
tExistingWarning",
Integer.toString(pid));
- final IsValidForActivationResults activationResult=
s =3D
- new IsValidForActivationResults(ContentFie=
ldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResults ac=
tivationResults =3D
+ new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(),
msg);
results.appendError(activationResults);
@@ -335,39 +330,36 @@
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.le=
ssAccessWarning",
values);
- final IsValidForActivationResults activationResult=
s =3D
- new IsValidForActivationResults(ContentFie=
ldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResults ac=
tivationResults =3D
+ new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(),
msg);
results.appendError(activationResults);
}
=
- // For each active site language
- final Iterator ite =3D languageCodes.iterator();
- while (ite.hasNext()) {
- final String lang =3D (String)ite.next();
- final String state =3D BigText_Field.getInstance()=
.getPageState(pid, lang);
+ final String state =3D BigText_Field.getInstance()=
.getPageState(pid, bigTextLocale.toString());
=
- if ("active".equals(state) || "staging_OK".equals(=
state)) { continue; }
+ if ("active".equals(state) || "staging_OK".equals(=
state)) {
+ continue;
+ }
if ("staging".equals(state)) {
if (page.getActiveVersionID() <=3D 0) {
final EngineMessage msg =3D new EngineMess=
age(
"org.jahia.engines.shared.BigText_=
Field.stagingWarning",
Integer.toString(pid));
- final IsValidForActivationResults activati=
onResults =3D
- new IsValidForActivationResults(Co=
ntentFieldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResult=
s activationResults =3D
+ new URLIntegrityValidForActivation=
Results(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toStr=
ing(),
msg);
results.appendError(activationResults);
- =
}
=
} else if ("markForDeleted".equals(state)) {
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Fiel=
d.markForDeleteWarning",
Integer.toString(pid));
- final IsValidForActivationResults activationRe=
sults =3D
- new IsValidForActivationResults(Conten=
tFieldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResults ac=
tivationResults =3D
+ new URLIntegrityValidForActivationResu=
lts(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(=
), =
msg);
results.appendError(activationResults);
@@ -377,8 +369,8 @@
final EngineMessage msg =3D new EngineMess=
age(
"org.jahia.engines.shared.BigText_=
Field.approvalWarning",
Integer.toString(pid));
- final IsValidForActivationResults activati=
onResults =3D
- new IsValidForActivationResults(Co=
ntentFieldKey.FIELD_TYPE,
+ final URLIntegrityValidForActivationResult=
s activationResults =3D
+ new URLIntegrityValidForActivation=
Results(ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toStr=
ing(),
msg);
results.appendError(activationResults);
@@ -391,7 +383,7 @@
JahiaException.ENGINE_ERROR,
JahiaException.ERROR_SEVERITY);
}
- }
+
}
=
final Iterator invalidKeys =3D theField.getWrongURLKeys().=
iterator();
@@ -400,8 +392,8 @@
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.wrongK=
eys",
invalidKey);
- final IsValidForActivationResults activationResults =
=3D
- new IsValidForActivationResults(ContentFieldKe=
y.FIELD_TYPE,
+ final URLIntegrityValidForActivationResults activa=
tionResults =3D
+ new URLIntegrityValidForActivationResults(=
ContentFieldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(),
msg);
results.appendError(activationResults);
@@ -426,8 +418,8 @@
final EngineMessage msg =3D new EngineMessage(
error.getRessourceBundleProp(), error.getValue=
s());
logger.debug("Adding 1 error: " + msg);
- final IsValidForActivationResults activationResults =
=3D
- new IsValidForActivationResults(ContentFieldKe=
y.FIELD_TYPE,
+ final WAIValidForActivationResults activationResul=
ts =3D
+ new WAIValidForActivationResults(ContentFi=
eldKey.FIELD_TYPE,
getID(), jParams.getLocale().toString(), msg);
results.appendError(activationResults);
}
@@ -435,9 +427,10 @@
logger.error("ClassNotFoundException", e);
}
}
+ }
=
if (results.getErrors().size() > 0) {
- results.setStatus(ActivationTestResults.FAILED_OPERATION_STATU=
S);
+ results.setStatus(ActivationTestResults.PARTIAL_OPERATION_STAT=
US);
}
=
logger.debug("Results for "+ getID() + ": " + results);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
