From ee6f739d59338e7bfd0828f66f79c69247eeb307 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 7 Jan 2021 20:14:33 +0000 Subject: [PATCH] Bug 27316: Convert 'undef' for sort to Yes and use Yes/No instead of 0/1 This patch changes the interface to remove the undef option We also update existing mappings and set default of 1 Comment previously indicated undef was treated differently, but in the code we treat undef as 1 That code is untoched to avoid creating problems for older mappings that may be reloaded To test: 1 - View the ES mappings, note you can set columns to Undef, 0, 1 2 - Set some to undef 3 - Apply patches 4 - Update database 5 - Undef now show as 'Yes' 6 - Confirm you can set columns as Yes/no 7 - Confirm that mandatory columns display correct value when readonly (see issues field) Signed-off-by: Fridolin Somers Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 9dd997e2d38a0ec07411166e5e497d48d95f9437) Signed-off-by: Fridolin Somers --- .../bug_23716_update_sort_mappings.perl | 6 +++++ .../searchengine/elasticsearch/mappings.tt | 22 ++++++++----------- 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_23716_update_sort_mappings.perl diff --git a/installer/data/mysql/atomicupdate/bug_23716_update_sort_mappings.perl b/installer/data/mysql/atomicupdate/bug_23716_update_sort_mappings.perl new file mode 100644 index 0000000000..b1c41bc065 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_23716_update_sort_mappings.perl @@ -0,0 +1,6 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE search_marc_to_field SET sort = 1 WHERE sort IS NULL" ); + $dbh->do( "ALTER TABLE search_marc_to_field MODIFY COLUMN sort tinyint(1) DEFAULT 1 NOT NULL COMMENT 'Sort defaults to 1 (Yes) and creates sort fields in the index, 0 (no) will prevent this'" ); + NewVersion( $DBversion, 27316, "In Elastisearch mappings convert NULL (Undef) for sort to 1 (Yes)"); +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt index 95efe7fda9..8e84c17858 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -253,7 +253,11 @@ a.add, a.delete { [% mapping.search_field_label | html %] - [% IF mapping.sort == 'undef' %]Undef[% ELSE %][% mapping.sort | html %][% END %] + [% IF mapping.sort == 0 %] + No + [% ELSE %] + Yes + [% END %] [% IF mapping.facet == 1 %]Yes[% ELSE %]No[% END %] @@ -277,20 +281,12 @@ a.add, a.delete { -- 2.39.5