xlawrence 2005/08/08 16:43:09 CEST
Modified files:
core/src/java/org/jahia/ajax AjaxServlet.java
Log:
fixed bug regarding pages action menus:
- whatever pid was specified, all launchers uris allways contained pid=1
Revision Changes Path
1.3 +7 -5 jahia/core/src/java/org/jahia/ajax/AjaxServlet.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/ajax/AjaxServlet.java.diff?r1=1.2&r2=1.3&f=h
Index: AjaxServlet.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/ajax/AjaxServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AjaxServlet.java 8 Aug 2005 08:21:16 -0000 1.2
+++ AjaxServlet.java 8 Aug 2005 14:43:08 -0000 1.3
@@ -140,6 +140,12 @@
final ProcessingContext jParams = pcf.getContext(request,
response,
super.getServletContext());
+ final String pageID = getParameter(request, response, PAGE);
+ if (pageID == null) return;
+
+ final int pid = Integer.parseInt(pageID);
+ if (pid > 1) { jParams.changePage(pid); }
+
final JahiaPage currentPage = jParams.getPage();
final JahiaUser currentUser = jParams.getUser();
@@ -158,7 +164,7 @@
logger.debug("jParams: pid = " + currentPage.getID() + ", user =
" +
currentUser.getName() + ", mode = " +
jParams.getOperationMode() + ", SessionID = " +
- jParams.getSessionID());
+ jParams.getSessionID() + ", lang = " +
jParams.getLocale());
final String objectType = getParameter(request, response, TYPE);
if (objectType == null) return;
@@ -172,10 +178,6 @@
final String parentID = getParameter(request, response, PARENT);
if (parentID == null) return;
- final String pageID = getParameter(request, response, PAGE);
- if (pageID == null) return;
- final int pid = Integer.parseInt(pageID);
-
logger.debug("processRequest: objectType=" + objectType + ",
objectID="+
objectID + ", definitionID=" + definitionID + ",
parentID=" +
parentID + ", pageID=" + pageID);
