You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/17 15:27:30 UTC

svn commit: r585487 - /myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java

Author: imario
Date: Wed Oct 17 06:27:30 2007
New Revision: 585487

URL: http://svn.apache.org/viewvc?rev=585487&view=rev
Log:
encode url to not loose any jsessionid etc

Modified:
    myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java

Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java?rev=585487&r1=585486&r2=585487&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/dialog/ModalDialogRenderer.java Wed Oct 17 06:27:30 2007
@@ -173,7 +173,13 @@
 
 	private void appendShowHideView(FacesContext context, StringBuffer buf, ModalDialog dlg)
 	{
-                buf.append(dlg.getDialogVar()).append(".oldOnShow=").append(dlg.getDialogVar()).append(".onShow;")
+		StringBuffer sbUrl = new StringBuffer();
+		sbUrl.append(context.getExternalContext().getRequestContextPath());
+		sbUrl.append("/");
+		sbUrl.append(dlg.getViewId());
+		String encodedUrl = context.getExternalContext().encodeActionURL(sbUrl.toString());
+
+		 buf.append(dlg.getDialogVar()).append(".oldOnShow=").append(dlg.getDialogVar()).append(".onShow;")
                    .append(dlg.getDialogVar())
 			.append(".onShow = function() {")
                         .append("this.oldOnShow();")
@@ -186,9 +192,7 @@
 			.append(dlg.getDialogVar())
 			.append("._myfaces_ok=false; ")
 			.append("content.contentWindow.location.replace('")
-			.append(context.getExternalContext().getRequestContextPath())
-			.append("/")
-			.append(dlg.getViewId())
+			.append(encodedUrl)
 			.append("'); ")
 			.append("}; ");