diff options
| author | Maciej PrzepioĢra <matthew@vaadin.com> | 2014-04-11 23:53:43 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-04-16 07:52:18 +0000 |
| commit | 0d4080ba5e5931fa928675ba6c95540e34b2f281 (patch) | |
| tree | 931268faf144feb338c2538189452c2fea6f2f71 /server/src/com | |
| parent | 6e91bdf4224d5e95cf1746775855c13c25e9b82c (diff) | |
| download | vaadin-framework-0d4080ba5e5931fa928675ba6c95540e34b2f281.tar.gz vaadin-framework-0d4080ba5e5931fa928675ba6c95540e34b2f281.zip | |
ContainerEventProvider returns style names from container. Fixes #10718
ContainerEventProvider doesn't actually return
style names from container in certain situations
(copy-pasted code). This patch fixes the problem.
Change-Id: I512ea260f34a6db0572b614db393699da152fa8d
(cherry picked from commit 4709b75bb47d28630dacbb240bb43de16d972371)
Diffstat (limited to 'server/src/com')
| -rw-r--r-- | server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java index 37ea255d27..b025de6f9a 100644 --- a/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java +++ b/server/src/com/vaadin/ui/components/calendar/ContainerEventProvider.java @@ -224,8 +224,8 @@ public class ContainerEventProvider implements CalendarEditableEventProvider, } if (styleNameProperty != null && item.getItemPropertyIds().contains(styleNameProperty)) { - basicEvent.setDescription(String.valueOf(item.getItemProperty( - descriptionProperty).getValue())); + basicEvent.setStyleName(String.valueOf(item.getItemProperty( + styleNameProperty).getValue())); } event = basicEvent; } |