Author: ivaynberg
Date: Mon Sep 22 11:32:11 2008
New Revision: 697933
URL: http://svn.apache.org/viewvc?rev=697933&view=rev
Log:
WICKET-1843
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
Modified:
wicket/branches/wicket-1.3.x/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.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java?rev=697933&r1=697932&r2=697933&view=diff
==============================================================================
---
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
(original)
+++
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Radio.java
Mon Sep 22 11:32:11 2008
@@ -100,9 +100,9 @@
if (group == null)
{
throw new WicketRuntimeException(
- "Radio component [" +
- getPath() +
- "] cannot find its
parent RadioGroup. All Radio components must be a child of or below in the
hierarchy of a RadioGroup component.");
+ "Radio component [" +
+ getPath() +
+ "] cannot find its parent RadioGroup.
All Radio components must be a child of or below in the hierarchy of a
RadioGroup component.");
}
@@ -150,13 +150,13 @@
// NOTE: do not encode the url as that would
give invalid
// JavaScript
tag.put("onclick", "window.location.href='" +
url +
- (url.toString().indexOf('?') >
-1 ? "&" : "?") + group.getInputName() +
- "=' + this.value;");
+ (url.toString().indexOf('?') > -1 ?
"&" : "?") + group.getInputName() +
+ "=' + this.value;");
}
}
- if (!isActionAuthorized(ENABLE) || !isEnabled() ||
!group.isEnabled())
+ if (!isEnableAllowed() || !isEnabled() || !group.isEnabled() ||
!group.isEnableAllowed())
{
tag.put(ATTR_DISABLED, ATTR_DISABLED);
}