From da080d44c1bcb23c241f185047ae35aad70b1027 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 23 Oct 2020 16:44:50 -0400 Subject: [PATCH] rename filter from bootstrap-table to advsearch so as not to conflict with our existing filter --- web/ajax/events.php | 2 +- web/skins/classic/views/js/events.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/ajax/events.php b/web/ajax/events.php index 75c90a311..ba3dad185 100644 --- a/web/ajax/events.php +++ b/web/ajax/events.php @@ -31,7 +31,7 @@ $search = isset($_REQUEST['search']) ? $_REQUEST['search'] : ''; // Advanced search contains an array of "column name" => "search text" pairs // Bootstrap table sends json_ecoded array, which we must decode -$advsearch = isset($_REQUEST['filter']) ? json_decode($_REQUEST['filter'], JSON_OBJECT_AS_ARRAY) : array(); +$advsearch = isset($_REQUEST['advsearch']) ? json_decode($_REQUEST['advsearch'], JSON_OBJECT_AS_ARRAY) : array(); // Sort specifies the name of the column to sort on $sort = 'StartTime'; diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js index 2743a9743..62f53a1d8 100644 --- a/web/skins/classic/views/js/events.js +++ b/web/skins/classic/views/js/events.js @@ -35,7 +35,8 @@ var params = // Called by bootstrap-table to retrieve zm event data function ajaxRequest(params) { - $j.getJSON(thisUrl + '?view=request&request=events&task=query', params.data) + console.log(params); + $j.getJSON(thisUrl + '?view=request&request=events&task=query'+filterQuery, params.data) .done(function(data) { var rows = processRows(data.rows); // rearrange the result into what bootstrap-table expects