[Openutils-svn] SF.net SVN: openutils:[956] trunk/openutils-mgnlstruts11/src/main/java/it/ openutils/mgnlstruts11/taglib

[<fg...@us...>]

Revision: 956
          http://openutils.svn.sourceforge.net/openutils/?rev=956&view=rev
Author:   fgiust
Date:     2008-12-15 18:09:30 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
don't overwrite target uri if the page has not been rendered by Magnolia

Modified Paths:
--------------
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java
    trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlLinkTag.java

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java	2008-12-11 18:23:03 UTC (rev 955)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlFormTag.java	2008-12-15 18:09:30 UTC (rev 956)
@@ -46,6 +46,13 @@
     @Override
     protected String renderFormStartElement()
     {
+        String pageUri = (String) this.pageContext.getRequest().getAttribute(MgnlStrutsUtils.ATTRIBUTE_ORIGINALURI);
+
+        if (pageUri == null)
+        {
+            return super.renderFormStartElement();
+        }
+
         HttpServletResponse response = (HttpServletResponse) this.pageContext.getResponse();
 
         // String actionUrl = response.encodeURL(RequestUtils.getActionMappingURL(this.action, this.pageContext));
@@ -65,7 +72,6 @@
         results.append("\" action=\"");
         // results.append(actionUrl);
 
-        String pageUri = (String) this.pageContext.getRequest().getAttribute(MgnlStrutsUtils.ATTRIBUTE_ORIGINALURI);
         String mgnlDest = MgnlStrutsUtils.extractDestinationFromClass(
             (HttpServletRequest) pageContext.getRequest(),
             styleClass);

Modified: trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlLinkTag.java
===================================================================
--- trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlLinkTag.java	2008-12-11 18:23:03 UTC (rev 955)
+++ trunk/openutils-mgnlstruts11/src/main/java/it/openutils/mgnlstruts11/taglib/MgnlLinkTag.java	2008-12-15 18:09:30 UTC (rev 956)
@@ -52,7 +52,13 @@
     @Override
     protected String calculateURL() throws JspException
     {
+        String pageUri = (String) this.pageContext.getRequest().getAttribute(MgnlStrutsUtils.ATTRIBUTE_ORIGINALURI);
 
+        if (pageUri == null)
+        {
+            return super.calculateURL();
+        }
+
         // Identify the parameters we will add to the completed URL
         Map<String, String> params = RequestUtils.computeParameters(
             pageContext,
@@ -98,8 +104,6 @@
             }
         }
 
-        String pageUri = (String) this.pageContext.getRequest().getAttribute(MgnlStrutsUtils.ATTRIBUTE_ORIGINALURI);
-
         String styleClass = getStyleClass();
         String mgnlDest = MgnlStrutsUtils.extractDestinationFromClass(
             (HttpServletRequest) pageContext.getRequest(),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.