LazyLoading Select fixes: (java) did not honor itemCaptionProperty, (theme) did not...

svn changeset:1298/svn branch:trunk

diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 2070153d5b93ff85c6388d3b44fab7d59d1770eb..6411d7682239461c4a3ee57c1081526696fd42ab 100644 (file)
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -345,8 +345,9 @@ public class Select extends AbstractField implements Container,
                                target
                                                .addAttribute("initial", optionsStream.getJSON(20, 0,
                                                                ""));
-                               target.addAttribute("selectedValue", toString() == null ? ""
-                                               : toString());
+                               String caption = getItemCaption(getValue());
+                               target.addAttribute("selectedValue", caption == null ? ""
+                                               : caption);
                        }
                }
                target.endTag("options");