Author: sshyrkov Date: Thu Oct 18 15:30:59 2007 New Revision: 18925 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18925&repname= =3Djahia Log: JAHIA-2560: Impossible to launch workflow engine with a sub page waiting fo= r deletion =
http://www.jahia.net/jira/browse/JAHIA-2560 Resolution: initialize map with site language settings in any case (side-ef= fect of the PEU-71 fix) 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=3D18925= &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 Thu Oct 18 15:30:59 2007 @@ -517,7 +517,7 @@ */ public ObjectKey getDefinitionKey(EntryLoadRequest loadRequest) { int defID =3D getDefinitionID(loadRequest); - return (PageDefinitionKey) PageDefinitionKey.getChildInstance(Stri= ng.valueOf(defID)); + return new PageDefinitionKey(defID); } = /** @@ -1976,10 +1976,8 @@ // data. If not, we simply delete directly the existing staging en= tries = Iterator allPageInfoIter =3D getPageInfos(true).iterator(); - Set deletedACLs =3D new HashSet(); while (allPageInfoIter.hasNext()) { - JahiaPageInfo curPageInfo =3D (JahiaPageInfo) allPageInfoIter.= next(); - deleteEntry(curPageInfo); + deleteEntry((JahiaPageInfo) allPageInfoIter.next()); } = } @@ -2979,12 +2977,8 @@ = // only do the activation for the request languages. if (languageCodes.contains(curPageInfo.getLanguageCode())) { - int newVersionStatus =3D 0; if (curPageInfo.getVersionID() =3D=3D -1) { result =3D true; - // page info is marked to be deleted, the backup statu= s will - // be -1 - newVersionStatus =3D -1; = // now le'ts find the active page info corresponding t= o this // staged page info. @@ -3060,15 +3054,20 @@ int pageType =3D getPageType(EntryLoadRequest.STAGED); JahiaSite theSite =3D jParams.getSite(); Map siteLanguageSettings =3D new HashMap(languageCodes.size()); + Vector languageSettings =3D theSite.getLanguageSettings(); + for (Iterator iterator =3D languageSettings.iterator(); iterator + .hasNext();) { + SiteLanguageSettings curSettings =3D (SiteLanguageSettings) it= erator + .next(); + siteLanguageSettings.put(curSettings.getCode(), curSettings); + } // 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()) { - Vector languageSettings =3D theSite.getLanguageSettings(); Enumeration languageSettingsEnum =3D languageSettings.elements= (); 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. @@ -3286,24 +3285,6 @@ return; } = - // the first operation to do is to change the status of all the fi= elds - // in the page. - int pageType =3D -1; - //Iterator pageInfoIter =3D mPageInfos.iterator(); -// toto : do not recursively change states, done in workflow service -// if (pageInfoIter.hasNext ()) { -// JahiaPageInfo curPageInfo =3D (JahiaPageInfo) pageInfoIter.n= ext (); -// pageType =3D curPageInfo.getPageType (); -// if (pageType =3D=3D JahiaPage.TYPE_LINK) { -// -// } else if (pageType =3D=3D JahiaPage.TYPE_DIRECT) { -// int siteID =3D getJahiaID (); -// ServicesRegistry sr =3D ServicesRegistry.getInstance (); -// sr.getJahiaFieldService ().setFieldsLanguageStates (lang= uageCodes, -// newWorkflowState, getID (), jParams, stateModifC= ontext); -// } -// } - Set processedLangs =3D new HashSet(); Iterator stagingIter =3D mStagingPageInfos.values().iterator(); try { _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
