commit | 4dde9f178ab937a3188205d8562134f1dba6a618 | [log] [tgz] |
---|---|---|
author | Rainer Döbele <doebele@apache.org> | Tue Feb 18 13:48:41 2020 +0100 |
committer | Rainer Döbele <doebele@apache.org> | Tue Feb 18 13:48:41 2020 +0100 |
tree | 019ab0b2703ba2e6221a09fc9cb35731f310bd90 | |
parent | c1ea08b5bcdbf0b8338ac88a1936b7147cc668eb [diff] | |
parent | 28c4f65475ad807dfc1754d5757c5aabf3944867 [diff] |
Merge branch 'master' of https://gitbox.apache.org/repos/asf/empire-db
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 @@ } 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