You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by de...@apache.org on 2020/02/14 12:57:01 UTC
[empire-db] branch master updated: EMPIREDB-327
This is an automated email from the ASF dual-hosted git repository.
derjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 28c4f65 EMPIREDB-327
28c4f65 is described below
commit 28c4f65475ad807dfc1754d5757c5aabf3944867
Author: Jan Glaubitz <ja...@glaubitz.org>
AuthorDate: Fri Feb 14 13:56:48 2020 +0100
EMPIREDB-327
---
.../apache/empire/jsf2/controls/CheckboxInputControl.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
index ca3ac7f..20fc7e9 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/controls/CheckboxInputControl.java
@@ -96,8 +96,17 @@ public class CheckboxInputControl extends InputControl
}
HtmlSelectBooleanCheckbox input = (HtmlSelectBooleanCheckbox) comp;
// disabled
- boolean disabled = ii.isDisabled();
- input.setDisabled(disabled);
+ Object dis = ii.getAttributeEx("disabled");
+ if (dis != null)
+ {
+ input.setDisabled(ObjectUtils.getBoolean(dis));
+ }
+ // field-readOnly
+ if (ObjectUtils.getBoolean(dis) == false)
+ {
+ input.setReadonly(ii.isFieldReadOnly());
+ input.setDisabled(ii.isFieldReadOnly());
+ }
// check phase
if (phaseId==PhaseId.RENDER_RESPONSE)
{ // style