diff options
| author | Maciej PrzepioĢra <matthew@vaadin.com> | 2014-04-11 23:53:43 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-04-16 07:37:51 +0000 |
| commit | 4709b75bb47d28630dacbb240bb43de16d972371 (patch) | |
| tree | c5e26e2c9fa4c9d8cedd974c4accccec21201fce /server/src/com/vaadin/ui | |
| parent | c6a7c81a57266988d04bdda4e454aa7c4bcc919e (diff) | |
| download | vaadin-framework-4709b75bb47d28630dacbb240bb43de16d972371.tar.gz vaadin-framework-4709b75bb47d28630dacbb240bb43de16d972371.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
Diffstat (limited to 'server/src/com/vaadin/ui')
| -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; } |