Author: cmailleux
Date: Fri Oct 12 15:38:05 2007
New Revision: 18854
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18854&repname=
=3Djahia
Log:
Correct issue PEU-71
by putting only a warning message if page titile not present and language n=
ot mandatory
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/TreeOperat=
ionResult.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/Tree=
OperationResult.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/content/TreeOperationResult.java&rev=3D1885=
4&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/content/TreeOperat=
ionResult.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/content/TreeOperat=
ionResult.java Fri Oct 12 15:38:05 2007
@@ -118,11 +118,11 @@
int count =3D 0;
ListIterator errorIter =3D errors.listIterator();
while (errorIter.hasNext()) {
- count++;
Object curError =3D errorIter.next();
if (count < errors.size()) {
result.append(curError.toString() + " , ");
}
+ count++;
}
result.append("]");
=
@@ -130,11 +130,11 @@
count =3D 0;
ListIterator warningIter =3D warnings.listIterator();
while (warningIter.hasNext()) {
- count++;
Object curWarning =3D warningIter.next();
if (count < warnings.size()) {
result.append(curWarning.toString() + " , ");
}
+ count++;
}
result.append("]");
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pag=
es/ContentPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/pages/ContentPage.java&rev=3D18854=
&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/pages/Con=
tentPage.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/pages/Con=
tentPage.java Fri Oct 12 15:38:05 2007
@@ -2994,7 +2994,7 @@
ActivationTestResults activationTestResults =3D super.isValidForAc=
tivation(languageCodes, jParams, stateModifContext);
int pageType =3D getPageType(EntryLoadRequest.STAGED);
JahiaSite theSite =3D jParams.getSite();
- =
+ Map siteLanguageSettings =3D new HashMap(languageCodes.size());
// first we must test if we have all the mandatory languages in our
// page only if the page is not marked for deletion.
if (!isMarkedForDelete()) {
@@ -3003,6 +3003,7 @@
while (languageSettingsEnum.hasMoreElements()) {
SiteLanguageSettings curSettings =3D (SiteLanguageSettings)
languageSettingsEnum.nextElement();
+ siteLanguageSettings.put(curSettings.getCode(),curSettings=
);
if (curSettings.isMandatory() && curSettings.isActivated()=
) {
// we found a mandatory language, let's check that the=
re at
// least an active or a staged entry for this field.
@@ -3048,19 +3049,33 @@
curPageInfo =3D (JahiaPageInfo) mActivePageInfos
.get(curLanguageCode);
}
- if (curPageInfo =3D=3D null || curPageInfo.getTitle() =3D=
=3D null) {
- try {
- final EngineMessage msg =3D new EngineMessage(
- "org.jahia.services.pages.ContentPage.noTi=
tleError");
- activationTestResults
- .appendError(new IsValidForActivationResul=
ts(
- ContentPageKey.PAGE_TYPE, getID(),
- curLanguageCode, msg));
- } catch (ClassNotFoundException cnfe) {
- logger
- .debug(
- "Error while creating activation t=
est node result",
- cnfe);
+ if (curPageInfo =3D=3D null || curPageInfo.getTitle() =3D=
=3D null ){
+ if (((SiteLanguageSettings) siteLanguageSettings.get(c=
urLanguageCode)).isMandatory()) {
+ try {
+ final EngineMessage msg =3D
+ new EngineMessage("org.jahia.services.=
pages.ContentPage.mandatoryLangMissingError");
+ activationTestResults
+ .appendError(new IsValidForActivationR=
esults(ContentPageKey.PAGE_TYPE,
+ =
getID(),
+ =
curLanguageCode,
+ =
msg));
+ } catch (ClassNotFoundException cnfe) {
+ logger
+ .debug("Error while creating activatio=
n test node result", cnfe);
+ }
+ } else {
+ try {
+ final EngineMessage msg =3D
+ new EngineMessage("org.jahia.services.=
pages.ContentPage.noTitleError");
+ activationTestResults
+ .appendWarning(new IsValidForActivatio=
nResults(ContentPageKey.PAGE_TYPE,
+ =
getID(),
+ =
curLanguageCode,
+ =
msg));
+ } catch (ClassNotFoundException cnfe) {
+ logger
+ .debug("Error while creating activatio=
n test node result", cnfe);
+ }
}
} else if (curPageInfo.getTitle().trim().length() =3D=3D 0=
) {
// empty title, let's signal it if mixed language mode=
is not activated
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
