From: Vsevolod Stakhov Date: Mon, 27 Mar 2017 09:57:59 +0000 (+0100) Subject: [WebUI] Fix history display X-Git-Tag: 1.5.4~14 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f07448bca867cf128203cec945d1838ed0998e75;p=rspamd.git [WebUI] Fix history display --- 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