Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ Fixes:
- [crashes] Fix free session for home widget
- [crashes] Use na for free session and free user when there's no data
- [crashes] Fix trend and change calculation for crash stats
- [push] Show segmentation, geo and cohorts related components in push drawer on editing draft.

Enterprise Fixes:
- [ldap] Error handling in ldap plugin on search error
- [license] Display notification for non global admin user
- [users] Load table data from report if user table calculation goes to report manager

Dependencies:
- Bump puppeteer from 24.14.0 to 24.15.0
Expand Down
17 changes: 13 additions & 4 deletions frontend/express/public/javascripts/countly/vue/data/vuex.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,23 @@
options.onOverrideResponse(context, res);
}
var convertedResponse = _dataTableAdapters.toStandardResponse(res, requestOptions);
if (!Object.prototype.hasOwnProperty.call(convertedResponse, "echo") ||
convertedResponse.echo >= context.state[echoField]) {
if (typeof options.onReady === 'function') {
convertedResponse.rows = options.onReady(context, convertedResponse.rows);
if (res.task_id) {
if (typeof options.onTask === 'function') {
options.onTask(context, res.task_id);
}
context.commit(_capitalized("set", resourceName), convertedResponse);
context.commit(_capitalized("set", lastSuccessfulRequestKey), requestOptions);
}
else {
if (!Object.prototype.hasOwnProperty.call(convertedResponse, "echo") ||
convertedResponse.echo >= context.state[echoField]) {
if (typeof options.onReady === 'function') {
convertedResponse.rows = options.onReady(context, convertedResponse.rows);
}
context.commit(_capitalized("set", resourceName), convertedResponse);
context.commit(_capitalized("set", lastSuccessfulRequestKey), requestOptions);
}
}
})
.catch(function(err) {
if (typeof options.onError === 'function') {
Expand Down
Loading