You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/11/29 00:40:20 UTC
svn commit: r885170 -
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
Author: jdonnerstag
Date: Sat Nov 28 23:40:20 2009
New Revision: 885170
URL: http://svn.apache.org/viewvc?rev=885170&view=rev
Log:
fixed org.apache.wicket.markup.html.form.Check should call Component.isEnabledInHierarchy()
Issue: WICKET-2582
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java?rev=885170&r1=885169&r2=885170&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/Check.java Sat Nov 28 23:40:20 2009
@@ -229,22 +229,18 @@
else
{
// TODO: following doesn't work with portlets, should be posted to a dynamic hidden
- // form
- // with an ActionURL or something
- // NOTE: do not encode the url as that would give invalid
- // JavaScript
+ // form with an ActionURL or something
+ // 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;");
}
}
- if (!isActionAuthorized(ENABLE) || !isEnabled() || !group.isEnabled())
+ if (!isActionAuthorized(ENABLE) || !isEnabledInHierarchy() || !group.isEnabledInHierarchy())
{
tag.put(ATTR_DISABLED, ATTR_DISABLED);
}
-
-
}
/**
@@ -260,7 +256,6 @@
return this;
}
-
/**
* Gets model
*
@@ -310,5 +305,4 @@
// because this component uses uuid field it cannot be stateless
return false;
}
-
}