Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory
james.mmbase.org:/tmp/cvs-serv20083/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
Modified Files:
NavigatorPanelAction.java
Log Message:
cmsc-639 worked on alias.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
Index: NavigatorPanelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorPanelAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NavigatorPanelAction.java 24 Dec 2007 13:40:54 -0000 1.5
+++ NavigatorPanelAction.java 16 Jan 2008 15:43:10 -0000 1.6
@@ -19,42 +19,19 @@
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
- String pathofpage;
-
String nodeId = request.getParameter("nodeId");
Node parentNode = cloud.getNode(nodeId);
- boolean secure = false;
- if(parentNode.getNodeManager().hasField(PagesUtil.SECURE_FIELD)) {
- secure = parentNode.getBooleanValue(PagesUtil.SECURE_FIELD);
- }
-
- if (ServerUtil.useServerName()) {
- String[] pathElements =
NavigationUtil.getPathElementsToRoot(parentNode, true);
+ String pathofpage = NavigationUtil.getNavigationItemUrl(request,
response, parentNode);
- pathofpage = HttpUtil.getWebappUri(request, pathElements[0], secure);
- for (int i = 1; i < pathElements.length; i++) {
- pathofpage += pathElements[i] + "/";
- }
- if (!request.getServerName().equals(pathElements[0])) {
- pathofpage = HttpUtil.addSessionId(request, pathofpage);
- }
- else {
- pathofpage = response.encodeURL(pathofpage);
- }
- }
- else {
- String path = NavigationUtil.getPathToRootString(parentNode, true);
- String webappuri = HttpUtil.getWebappUri(request, secure);
- pathofpage = response.encodeURL(webappuri + path);
- }
String fresh = request.getParameter("fresh");
- if (!StringUtil.isEmpty(fresh))
+ if (!StringUtil.isEmpty(fresh)) {
request.setAttribute("fresh", fresh);
- String page = request.getParameter("page");
+ }
request.setAttribute("toolbar", "toolbar.jsp");
request.setAttribute("nodeId", nodeId);
request.setAttribute("pathofpage", pathofpage);
return mapping.findForward("success");
}
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
