diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-22 12:14:22 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-22 12:14:22 +0200 |
| commit | e578248b13275b94c9985aaadc1bf16b4c8b20e5 (patch) | |
| tree | 0a5aba877d47d538869fc061ee941f264a84af8d /src/com/vaadin/ui/Select.java | |
| parent | 4b1d80a7b8906bd8ac72e762ea19e3cb55827f6b (diff) | |
| parent | b23d8dfaa5c27cd4bed0df1a654e59b0464707b5 (diff) | |
| download | vaadin-framework-e578248b13275b94c9985aaadc1bf16b4c8b20e5.tar.gz vaadin-framework-e578248b13275b94c9985aaadc1bf16b4c8b20e5.zip | |
Merge remote branch 'origin/6.8'
Conflicts:
tests/integration_tests.xml
Diffstat (limited to 'src/com/vaadin/ui/Select.java')
| -rw-r--r-- | src/com/vaadin/ui/Select.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java index 7b6fc07e5b..439efdb864 100644 --- a/src/com/vaadin/ui/Select.java +++ b/src/com/vaadin/ui/Select.java @@ -148,7 +148,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering, } // Adds the required attribute - if (isRequired()) { + if (!isReadOnly() && isRequired()) { target.addAttribute("required", true); } |