From d89f9a55f6b450ef417d3327c5cb84304db7dd5c Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 21 Oct 2022 13:30:39 +0000
Subject: [PATCH] Bug 17170: (follow-up) Adjust for RM follow-ups

Use direct DB names when saving/loading
Don't escape boolean values as strings

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/en/modules/admin/search_filters.tt   | 4 ++--
 .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt    | 4 ++--
 .../intranet-tmpl/prog/en/modules/catalogue/results.tt      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
index b54b7c6f55..66cc05e66a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/search_filters.tt
@@ -142,8 +142,8 @@
                             let filter_buttons = '<a class="btn btn-default btn-xs edit_filter" onclick="edit_filter(this)"';
                             filter_buttons += ' data-filter_id="'+ escape_str(filter.search_filter_id);
                             filter_buttons += '" data-filter_name="'+ escape_str(filter.name);
-                            filter_buttons += '" data-filter_opac="'+ escape_str(filter.opac);
-                            filter_buttons += '" data-filter_staff_client="'+ escape_str(filter.staff_client);
+                            filter_buttons += '" data-filter_opac="'+ filter.opac;
+                            filter_buttons += '" data-filter_staff_client="'+ filter.staff_client;
                             filter_buttons += '" ><i class="fa fa-pencil"></i> '+_("Edit filter")+'</a>';
                             filter_buttons += '<a class="btn btn-default btn-xs" href="/cgi-bin/koha/catalogue/search.pl?edit_filter='+encodeURIComponent(filter.search_filter_id)+'"><i class="fa fa-search"></i> '+ _("Edit search") + '</a>';
                             filter_buttons += '<a class="btn btn-default btn-xs delete_filter" onclick="delete_filter(this)"';
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 16f3f1c781..b1c7c67579 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -485,8 +485,8 @@
                     contentType: "application/json",
                     data: JSON.stringify({
                         name: "[% edit_filter.name | html %]",
-                        filter_query: JSON.stringify({ operands: operands, indexes: indexes, operators:operators }),
-                        filter_limits: JSON.stringify({ limits: limits }),
+                        query: JSON.stringify({ operands: operands, indexes: indexes, operators:operators }),
+                        limits: JSON.stringify({ limits: limits }),
                         opac: opac,
                         staff_client: staff_client,
                     })
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 52e6ca2bbb..7d6c99e60d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -847,7 +847,7 @@
                             opt.prop('selected', true);
                         }
                         opt.attr("value", filter.search_filter_id);
-                        opt.attr("title", "Query:" + filter.filter_query + " Limit:"+filter.filter_limits);
+                        opt.attr("title", "Query:" + filter.query + " Limit:"+filter.limits);
                         opt.text(filter.name);
                         opt.data("filter", filter);
                     });
@@ -881,8 +881,8 @@
                     contentType: "application/json",
                     data: JSON.stringify({
                         name: name,
-                        filter_query: JSON.stringify(search_result.query_json),
-                        filter_limits: JSON.stringify(search_result.limit_json),
+                        query: JSON.stringify(search_result.query_json),
+                        limits: JSON.stringify(search_result.limit_json),
                         opac: opac,
                         staff_client: staff,
                     })
-- 
2.39.5