Author: tdraier
Date: Tue Jul 17 12:04:36 2007
New Revision: 18022
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18022&repname=
=3Djahia
Log:
fixed page activation probleme, do not need to activate own field and conta=
iner here
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=3D18022=
&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 Tue Jul 17 12:04:36 2007
@@ -2683,13 +2683,6 @@
getJahiaPageService().
getPagesPointingOnPage(getID(), jParams);
=
- // let's add our own page, only if we are at the start.
- if (stateModifContext.getStartObject().equals(new ContentPageK=
ey(getID()))) {
- referingPages.add(new JahiaPage(this, getPageTemplate(jPar=
ams),
- getACL(),
- jParams.getEntryLoadRequest()));
- }
-
Enumeration referingPagesEnum =3D referingPages.elements();
while (referingPagesEnum.hasMoreElements()) {
JahiaPage curPage =3D (JahiaPage) referingPagesEnum.nextEl=
ement();
@@ -2816,31 +2809,6 @@
=
activationResults.merge(
containerActivationResult);
-
- // It's important to active the pa=
rent container list too
- // to have correct versioning state
- try {
- ContentContainerList container=
List =3D
- ContentContainerList.
- getContainerLi=
st(
- curPag=
eFieldContainer.getListID());
- if (containerList !=3D null) {
- containerActivationResult =
=3D ServicesRegistry.getInstance().getJahiaContainersService()
- .activateStagedCon=
tainerLists(languageCodes,
- getID(),
- user,
- saveVersio=
n,
- stateModif=
Context);
- activationResults.merge(
- containerActivatio=
nResult);
- }
- } catch (Throwable t) {
- logger.debug("Error activating=
container list ", t);
- throw new JahiaException(
- "Error in workflow, co=
ntainer list on page can not be activated",
- "Error activating cont=
ainer list ", JahiaException.OBJECT_ERROR,
- JahiaException.ERROR_S=
EVERITY, t);
- }
}
} else {
// field is not in a container. nothin=
g more to do...
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
