Author: ate
Date: Fri Sep 21 05:03:18 2007
New Revision: 578078
URL: http://svn.apache.org/viewvc?rev=578078&view=rev
Log:
WICKET-649: New Wicket Portlet support: fix appending query parameters
Also fixing AbstractAjaxBehavior.getCallbackUrl(boolean onlyTargetActivePage)
for UrlCompressingWebCodingStrategy
See: https://issues.apache.org/jira/browse/WICKET-649#action_12529396
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?rev=578078&r1=578077&r2=578078&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
Fri Sep 21 05:03:18 2007
@@ -22,6 +22,7 @@
import org.apache.wicket.Page;
import org.apache.wicket.RequestCycle;
import org.apache.wicket.RequestListenerInterface;
+import org.apache.wicket.behavior.IActivePageBehaviorListener;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.request.WebRequestCodingStrategy;
import org.apache.wicket.request.RequestParameters;
@@ -130,6 +131,10 @@
if (params != null && params.getUrlDepth() != 0)
{
url.append(params.getUrlDepth());
+ }
+ if
(IActivePageBehaviorListener.INTERFACE.getName().equals(listenerName))
+ {
+ url.append(url.indexOf("?") > -1 ? "&" :
"?").append(IGNORE_IF_NOT_ACTIVE_PARAMETER_NAME).append("=true");
}
return requestCycle.getOriginalResponse().encodeURL(url);
}