Author: ivaynberg
Date: Wed Nov 23 06:59:27 2011
New Revision: 1205306
URL: http://svn.apache.org/viewvc?rev=1205306&view=rev
Log:
fix 404 when accessing modal from a stateless page
Issue: WICKET-4241
Modified:
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified:
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1205306&r1=1205305&r2=1205306&view=diff
==============================================================================
---
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
(original)
+++
wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Wed Nov 23 06:59:27 2011
@@ -1046,17 +1046,23 @@ public class ModalWindow extends Panel
throw new WicketRuntimeException("Error
creating page for modal dialog.");
}
CharSequence pageUrl = null;
+ RequestCycle requestCycle = RequestCycle.get();
+
if (page.isPageStateless())
{
- pageUrl =
RequestCycle.get().urlFor(page.getClass(), page.getPageParameters());
+ pageUrl = requestCycle.urlFor(page.getClass(),
page.getPageParameters());
+ appendAssignment(buffer, "settings.ie8_src",
pageUrl);
}
else
{
IRequestHandler handler = new
RenderPageRequestHandler(new PageProvider(page));
- pageUrl = RequestCycle.get().urlFor(handler);
- String ie8_pageUrl =
RequestCycle.get().mapUrlFor(handler).toString();
+
+ pageUrl = requestCycle.urlFor(handler);
+ String ie8_pageUrl =
requestCycle.getUrlRenderer().renderRelativeUrl(
+ requestCycle.mapUrlFor(handler));
appendAssignment(buffer, "settings.ie8_src",
ie8_pageUrl);
}
+
appendAssignment(buffer, "settings.src", pageUrl);
}
else
