Merge branch 'master' into SER-2260-parameterize-hard-coded-texts-in-feedback-widgets

Author: ArtursKadikis

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Version xx.xx.xx
 
 Fixes:
+- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
 - [gridfs] fixes for moving to Promises
 - [surveys] "Select one" text in the widget can be edited now
 

frontend/express/public/core/events/javascripts/countly.details.models.js

@@ -886,6 +886,9 @@
                 return countlyAllEvents.service.fetchAllEventsData(context, period)
                     .then(function(res) {
                         if (res) {
+                            if (Array.isArray(res.list)) {
+                                res.list = res.list.map(eventName => countlyCommon.unescapeHtml(eventName));
+                            }
                             context.commit("setAllEventsData", res);
                             if ((!context.state.selectedEventName) || (res.map && res.map[context.state.selectedEventName] && !res.map[context.state.selectedEventName].is_visible) || (res.list && res.list.indexOf(context.state.selectedEventName) === -1)) {
                                 var appId = countlyCommon.ACTIVE_APP_ID;