From c345fc2b8d2effc7cb73e605b054041fe93adeea Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 10 Apr 2014 12:25:42 -0400 Subject: [PATCH] Fix display of category of events Fixes #2703 --- NEWS | 1 + UI/WebServerResources/SchedulerUI.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 82c7f5bfa..1e64cf736 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ Bug fixes - fixed SmartReply/Forward when ReplaceMime was omitted (#2680) - fixed wrong generation of weekly repetitive events with ActiveSync (#2654) - fixed incorrect XML data conversion with ActiveSync (#2695) + - fixed display of events having a category with HTML entities (#2703) 2.2.3 (2014-04-03) ------------------ diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 1b5e96a16..897d21a06 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1794,10 +1794,11 @@ function newBaseEventDIV(eventRep, event, eventText) { createElement("img", null, null, {src: ResourcesURL + "/alarm.png"}, null, iconSpan); if (event[10] != null) { - var categoryStyle = categoriesStyles.get(event[10]); + var category = event[10].decodeEntities(); + var categoryStyle = categoriesStyles.get(category); if (!categoryStyle) { categoryStyle = 'category_' + categoriesStyles.keys().length; - categoriesStyles.set([event[10]], categoryStyle); + categoriesStyles.set([category], categoryStyle); } innerDiv.addClassName(categoryStyle); }