Author: ate
Date: Wed Sep 12 16:49:44 2007
New Revision: 575129
URL: http://svn.apache.org/viewvc?rev=575129&view=rev
Log:
WICKET-649: New Wicket Portlet support: fix appending query parameters
- Fixing IOnChangeListener components with
wantOnSelectionChangedNotifications()==true
for components not embedded in a form although this still requires a custom
portal extension to allow adding query parameters to a portlet url
See: https://issues.apache.org/jira/browse/WICKET-649#action_12526944
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.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/markup/html/form/Check.java?rev=575129&r1=575128&r2=575129&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
Wed Sep 12 16:49:44 2007
@@ -166,7 +166,7 @@
// with an ActionURL or something
// NOTE: do not encode the url as that would
give invalid
// JavaScript
- tag.put("onclick", "window.location.href='" +
url + "&" + group.getInputName()
+ tag.put("onclick", "window.location.href='" +
url + (url.toString().indexOf('?')>-1 ? "&" : "?") + group.getInputName()
+ "=' + this.value;");
}
}
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.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/markup/html/form/CheckBox.java?rev=575129&r1=575128&r2=575129&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
Wed Sep 12 16:49:44 2007
@@ -180,7 +180,7 @@
// with an ActionURL or something
// NOTE: do not encode the url as that would
give invalid
// JavaScript
- tag.put("onclick", "window.location.href='" +
url + "&" + getInputName()
+ tag.put("onclick", "window.location.href='" +
url + (url.toString().indexOf('?')>-1 ? "&" : "?") + getInputName()
+ "=' + this.checked;");
}
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.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/markup/html/form/DropDownChoice.java?rev=575129&r1=575128&r2=575129&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/DropDownChoice.java
Wed Sep 12 16:49:44 2007
@@ -190,7 +190,7 @@
{
// TODO: following doesn't work with portlets,
should be posted to a dynamic hidden form
// with an ActionURL or something
- tag.put("onchange", "window.location.href='" +
url + "&" + getInputName()
+ tag.put("onchange", "window.location.href='" +
url + (url.toString().indexOf('?')>-1 ? "&" : "?") + getInputName()
+ "=' +
this.options[this.selectedIndex].value;");
}
}
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.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/markup/html/form/Radio.java?rev=575129&r1=575128&r2=575129&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
Wed Sep 12 16:49:44 2007
@@ -149,7 +149,7 @@
// with an ActionURL or something
// NOTE: do not encode the url as that would
give invalid
// JavaScript
- tag.put("onclick", "window.location.href='" +
url + "&" + group.getInputName()
+ tag.put("onclick", "window.location.href='" +
url + (url.toString().indexOf('?')>-1 ? "&" : "?") + group.getInputName()
+ "=' + this.value;");
}
}
Modified:
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.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/markup/html/form/RadioChoice.java?rev=575129&r1=575128&r2=575129&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
(original)
+++
wicket/branches/wicket-1.3.0-beta3-portlet-support/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Wed Sep 12 16:49:44 2007
@@ -483,7 +483,7 @@
// NOTE: do not encode the url
as that would give
// invalid JavaScript
buffer.append("
onclick=\"window.location.href='").append(url).append(
- "&" +
getInputName()).append("=").append(id).append("';\"");
+
(url.toString().indexOf('?')>-1 ? "&" : "?") +
getInputName()).append("=").append(id).append("';\"");
}
}
