[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms NavigatorPanelAction.java

[mguo]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory 
james.mmbase.org:/tmp/cvs-serv14816/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms

Modified Files:
        NavigatorPanelAction.java 
Log Message:
CMSC-752 move preview function to jsp.remove java script.


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-752


Index: NavigatorPanelAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorPanelAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NavigatorPanelAction.java   27 May 2008 08:21:31 -0000      1.9
+++ NavigatorPanelAction.java   2 Jun 2008 09:04:41 -0000       1.10
@@ -18,21 +18,23 @@
                        Cloud cloud) throws Exception {
 
                String nodeId = request.getParameter("nodeId");
+      String pageMode = request.getParameter("pageMode");
 
                Node parentNode = cloud.getNode(nodeId);
-
-               String pathofpage = NavigationUtil.getNavigationItemUrl(request,
-                               response, parentNode);
+      String pathofpage = NavigationUtil.getNavigationItemUrl(request, 
response, parentNode);
 
                String pageCurMode = "edit";
 
-               if (StringUtils.isNotEmpty(request.getParameter("pageMode"))) {
+      if (StringUtils.isNotEmpty(pageMode)) {
                        pageCurMode = request.getParameter("pageMode");
                }
-               else if 
(StringUtils.isNotEmpty((String)request.getSession().getAttribute("pageMode"))) 
{
-                       pageCurMode = 
(String)request.getSession().getAttribute("pageMode");
+      else {
+         String sessionPageModel = (String) 
request.getSession().getAttribute("pageMode");
+         if (StringUtils.isNotEmpty(sessionPageModel)) {
+            pageCurMode = (String) 
request.getSession().getAttribute("pageMode");
+         }
                }
-               request.getSession().removeAttribute("pageMode");
+
                request.getSession().setAttribute("pageMode", pageCurMode);
 
                String fresh = request.getParameter("fresh");
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs