Bugzilla – Attachment 142385 Details for
Bug 17170
Add the ability to create 'saved searches' for use as filters when searching the catalog
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17170: (follow-up) Adjust for RM follow-ups
Bug-17170-follow-up-Adjust-for-RM-follow-ups.patch (text/plain), 4.38 KB, created by
Nick Clemens (kidclamp)
on 2022-10-21 13:36:01 UTC
(
hide
)
Description:
Bug 17170: (follow-up) Adjust for RM follow-ups
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2022-10-21 13:36:01 UTC
Size:
4.38 KB
patch
obsolete
>From 2376579cb9df6a678149fae8b4e5609329a35b7b 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 >--- > .../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.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17170
:
133263
|
133264
|
133265
|
133266
|
133267
|
133268
|
133269
|
133270
|
133361
|
133376
|
137027
|
137028
|
137029
|
137030
|
137031
|
137032
|
137033
|
137034
|
137035
|
137036
|
137186
|
137187
|
137188
|
137189
|
137190
|
137191
|
137192
|
137193
|
137194
|
137195
|
137808
|
137809
|
137810
|
137811
|
137812
|
137813
|
137814
|
137815
|
137816
|
137817
|
138505
|
138506
|
138507
|
138508
|
138509
|
138510
|
138511
|
138512
|
138513
|
138514
|
139948
|
139949
|
139950
|
139951
|
139952
|
139953
|
139954
|
139955
|
139956
|
139957
|
141228
|
141229
|
141230
|
141231
|
141232
|
141233
|
141234
|
141235
|
141236
|
141237
|
141316
|
141317
|
141318
|
141319
|
141320
|
141321
|
141322
|
141323
|
141324
|
141325
|
141326
|
141327
|
141328
|
141348
|
141349
|
141350
|
141351
|
141352
|
141353
|
141354
|
141355
|
141356
|
141357
|
141358
|
141359
|
141360
|
141422
|
141423
|
141424
|
141425
|
141426
|
141427
|
141428
|
141429
|
141430
|
141431
|
141432
|
141433
|
141434
|
141435
|
141436
|
141437
|
141438
|
141461
|
141462
|
142365
|
142367
|
142368
|
142369
|
142370
|
142371
|
142372
|
142373
|
142374
|
142375
|
142376
|
142377
|
142378
|
142379
|
142380
|
142381
|
142382
|
142383
|
142384
| 142385 |
142494
|
142498