knguyen 2004/11/05 13:21:55 CET
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/java/org/jahia/services/fields ContentPageField.java
src/java/org/jahia/services/pages JahiaPageBaseService.java
src/java/org/jahia/views/engines/versioning/pages/actions
PagesVersioningAction.java
Log:
- contentPage.getChilds(user) should be deprecated and we should use
contentPage.getChilds(jParams) that use correct entryLoadRequest instead od
EntryLoadRequest.CURRENT( which use "en" as arbitrary lang)
Revision Changes Path
1.74.4.8 +11 -0 jahia/src/java/org/jahia/services/fields/ContentPageField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/fields/ContentPageField.java.diff?r1=1.74.4.7&r2=1.74.4.8&f=h
1.67.2.8 +15 -5
jahia/src/java/org/jahia/services/pages/JahiaPageBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/pages/JahiaPageBaseService.java.diff?r1=1.67.2.7&r2=1.67.2.8&f=h
1.19.2.10 +1 -1
jahia/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/views/engines/versioning/pages/actions/PagesVersioningAction.java.diff?r1=1.19.2.9&r2=1.19.2.10&f=h
Index: ContentPageField.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/fields/Attic/ContentPageField.java,v
retrieving revision 1.74.4.7
retrieving revision 1.74.4.8
diff -u -r1.74.4.7 -r1.74.4.8
--- ContentPageField.java 2 Nov 2004 16:50:41 -0000 1.74.4.7
+++ ContentPageField.java 5 Nov 2004 12:21:54 -0000 1.74.4.8
@@ -675,6 +675,17 @@
}
}
+ /*
+ // The code bellow try to address the issue bellow
+ // Issue :
+ // 1) Home page activated
+ // 2) add ->subpage A1 ( simple), add sub-sub A11, then active
from home
+ // 3) move A11 to Home ( top menu ) , do not active
+ // 4) restore (exact) from home just before move ( last active
date ), select only home page !!!
+ // --> A1 is not deleted but not attached anywhere, because it's
staged parent page field is marked for delete here
+ //
+ */
+
// check for page move and restore version
if ( stateModifContext instanceof
RestoreVersionStateModificationContext ){
if (
!stateModifContext.getStartObject().equals(contentPage.getObjectKey()) ){
Index: JahiaPageBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/pages/Attic/JahiaPageBaseService.java,v
retrieving revision 1.67.2.7
retrieving revision 1.67.2.8
diff -u -r1.67.2.7 -r1.67.2.8
--- JahiaPageBaseService.java 2 Nov 2004 16:50:41 -0000 1.67.2.7
+++ JahiaPageBaseService.java 5 Nov 2004 12:21:54 -0000 1.67.2.8
@@ -722,11 +722,15 @@
// let's retrieve the guest user first...
ContentPage contentPage = lookupContentPage(pageID, true);
- JahiaUser guestUser = ServicesRegistry.getInstance().
+ JahiaUser user = ServicesRegistry.getInstance().
getJahiaUserManagerService()
.lookupUser(contentPage.getJahiaID(), "guest");
+ ParamBean jParams = Jahia.getThreadParamBean();
+ if ( jParams != null ){
+ user = jParams.getUser();
+ }
- return getPageChilds(pageID, loadFlag, guestUser, loadRequest);
+ return getPageChilds(pageID, loadFlag, user, loadRequest);
}
public Vector getPageChilds (int pageID, int loadFlag, ParamBean jParam)
@@ -737,11 +741,17 @@
public Vector getPageChilds (int pageID, int loadFlag, JahiaUser user)
throws JahiaException {
-
- return getPageChilds(pageID, loadFlag, user, EntryLoadRequest.CURRENT);
+ // Suppose we have a site in French, using an arbitrary
EntryLoadRequest.CURRENT doesn't work very well
+ // because it request page in English. So we prefer
+ ParamBean jParams = Jahia.getThreadParamBean();
+ EntryLoadRequest loadRequest = null;
+ if ( jParams != null ){
+ loadRequest = jParams.getEntryLoadRequest();
+ }
+ return getPageChilds(pageID, loadFlag, user,loadRequest);
}
- private Vector getPageChilds (int pageID, int loadFlag, JahiaUser user,
+ public Vector getPageChilds (int pageID, int loadFlag, JahiaUser user,
EntryLoadRequest loadRequest)
throws JahiaException {
Index: PagesVersioningAction.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/views/engines/versioning/pages/actions/Attic/PagesVersioningAction.java,v
retrieving revision 1.19.2.9
retrieving revision 1.19.2.10
diff -u -r1.19.2.9 -r1.19.2.10
--- PagesVersioningAction.java 4 Nov 2004 15:28:06 -0000 1.19.2.9
+++ PagesVersioningAction.java 5 Nov 2004 12:21:54 -0000 1.19.2.10
@@ -1320,7 +1320,7 @@
ArrayList selectedPages,
ArrayList processedPages,
ParamBean jParams ) throws JahiaException{
- Enumeration childs = contentPage.getChilds(user);
+ Enumeration childs = contentPage.getChilds(jParams);
while (childs.hasMoreElements()){
JahiaPage child = (JahiaPage)childs.nextElement();
ContentPage contentPageChild = ContentPage.getPage(child.getID());
