Skip to content

Commit 66fa570

Browse files
authored
Merge branch 'master' into SER-2840-apply-android-platform-settings-to-huawei-as-well
2 parents ed47ca6 + 824072a commit 66fa570

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
## Version 25.03.X
2+
Fixes:
3+
- [dashboards] Unescape event segment values in meta
4+
25
Enterprise fixes:
36
- [data-manager] Fix validation approval button label
47
- [data-manager] Fix validation table column names

plugins/dashboards/api/parts/dashboards.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,6 +1213,14 @@ function getEventsModel(params, apps, appId, collection, segment, event, widget)
12131213
}
12141214

12151215
fn(function(data) {
1216+
if (data.meta && data.meta.segments) {
1217+
data.meta.segments.forEach((sg) => {
1218+
if (data.meta[sg] && data.meta[sg].length > 0) {
1219+
data.meta[sg] = data.meta[sg].map((item) => common.decode_html(item));
1220+
}
1221+
});
1222+
}
1223+
12161224
countlyCommon.setPeriod(paramsObj.qstring.period);
12171225

12181226
var model = countlyModel.load("event");
@@ -1315,4 +1323,4 @@ function getCrashModel(params, apps, appId, collection, widget) {
13151323
});
13161324
}
13171325

1318-
module.exports = dashboard;
1326+
module.exports = dashboard;

0 commit comments

Comments
 (0)