aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-03-27 10:57:59 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2017-03-27 10:57:59 +0100
commitf07448bca867cf128203cec945d1838ed0998e75 (patch)
tree1799ce222d71cfc27658a4086bc1b2a6ccd9ff60
parente8aff44f70d7d477cade15d96caa378416462d20 (diff)
downloadrspamd-f07448bca867cf128203cec945d1838ed0998e75.tar.gz
rspamd-f07448bca867cf128203cec945d1838ed0998e75.zip
[WebUI] Fix history display
-rw-r--r--interface/js/app/history.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/interface/js/app/history.js b/interface/js/app/history.js
index 6dcc3e612..02c277d2f 100644
--- a/interface/js/app/history.js
+++ b/interface/js/app/history.js
@@ -423,7 +423,8 @@ function($, _, Humanize) {
.map(function (d){ return d.data; });
if (neighbours_data.length > 0) {
var data = {};
- data.rows = neighbours_data.map(function(e) {return e.rows;});
+ data.rows = [].concat.apply([], neighbours_data
+ .map(function(e) {return e.rows;}));
data.version = neighbours_data[0].version;
var items = process_history_data(data);
@@ -488,7 +489,7 @@ function($, _, Humanize) {
$('#updateHistory').off('click');
$('#updateHistory').on('click', function (e) {
e.preventDefault();
- interface.getHistory(rspamd, tables);
+ interface.getHistory(rspamd, tables, neighbours, checked_server);
});
// @reset history log