Author: cmailleux
Date: Wed Oct 17 10:11:22 2007
New Revision: 18888
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18888&repname=
=3Djahia
Log:
Correct issue JAHIA-2541
Avoid testing on shared as this do not exist for a page
Modified:
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/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=3D18888=
&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 Wed Oct 17 10:11:22 2007
@@ -3050,31 +3050,38 @@
.get(curLanguageCode);
}
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);
+ boolean b =3D "shared".equals(curLanguageCode.toLowerC=
ase().trim());
+ // do not treat shared as even if you have "shared" th=
e title page infos will return the same title
+ // for each language and the "shared" language do not =
exist in this case.
+ // The title is replciated among all languages so avoi=
d testing on shared.
+ if (!b) {
+ if (((SiteLanguageSettings) siteLanguageSettings.g=
et(curLanguageCode)).isMandatory()) {
+ try {
+ final EngineMessage msg =3D
+ new EngineMessage(
+ "org.jahia.services.pages.=
ContentPage.mandatoryLangMissingError");
+ activationTestResults
+ .appendError(new IsValidForActivat=
ionResults(ContentPageKey.PAGE_TYPE,
+ =
getID(),
+ =
curLanguageCode,
+ =
msg));
+ } catch (ClassNotFoundException cnfe) {
+ logger.debug("Error while creating activat=
ion 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 {
+ try {
+ final EngineMessage msg =3D
+ new EngineMessage("org.jahia.servi=
ces.pages.ContentPage.noTitleError");
+ IsValidForActivationResults forActivationR=
esults =3D
+ new IsValidForActivationResults(Co=
ntentPageKey.PAGE_TYPE,
+ ge=
tID(),
+ cu=
rLanguageCode,
+ ms=
g);
+ activationTestResults.appendWarning(forAct=
ivationResults);
+ } catch (ClassNotFoundException cnfe) {
+ logger.debug("Error while creating activat=
ion test node result", cnfe);
+ }
}
}
} else if (curPageInfo.getTitle().trim().length() =3D=3D 0=
) {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
