From 4b826748ca227ed33ce468f1714697cf17de6d82 Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Tue, 16 Apr 2019 09:37:54 +0000 Subject: [PATCH] Bug 20388: QA fixes: - pass search field objects in template instead of unblessed ones - disable drag n drop Signed-off-by: Julian Maurice Signed-off-by: Michal Denar --- admin/searchengine/elasticsearch/mappings.pl | 12 +----------- .../admin/searchengine/elasticsearch/mappings.tt | 18 ++++-------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl index 37cb0ba..0e6c8d0 100755 --- a/admin/searchengine/elasticsearch/mappings.pl +++ b/admin/searchengine/elasticsearch/mappings.pl @@ -256,17 +256,7 @@ for my $index_name (@index_names) { push @indexes, { index_name => $index_name, mappings => \@mappings }; } -my $search_fields = Koha::SearchFields->search( {}, { order_by => ['name'] } ); -my @all_search_fields; -while ( my $search_field = $search_fields->next ) { - my $search_field_unblessed = $search_field->unblessed; - $search_field_unblessed->{mapped_biblios} = 1 if $search_field->is_mapped_biblios; - - $search_field_unblessed->{is_mapped} = $schema->resultset('SearchMarcToField')->search( - { search_field_id => $search_field->id })->count; - - push @all_search_fields, $search_field_unblessed; -} +my @all_search_fields = Koha::SearchFields->search( {}, { order_by => ['name'] } ); $template->param( indexes => \@indexes, 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 1d98313..6956ea6 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 @@ -36,6 +36,7 @@ $(this).parents('tr').remove(); var line = $(this).closest("tr"); + var name; // We clicked delete button on search fields tab. if (name = $(line).find('input[name="search_field_name"]').val()) { // Prevent user from using a search field for a mapping @@ -54,9 +55,6 @@ } }); - $("table.mappings").tableDnD( { - onDragClass: "dragClass", - } ); $('.add').click(function() { var table = $(this).closest('table'); var index_name = $(table).attr('data-index_name'); @@ -72,10 +70,6 @@ $(search_field_line).find('a.btn-default').addClass('disabled'); clean_line(line); - - $(table).tableDnD( { - onDragClass: "dragClass", - } ); } }); @@ -90,12 +84,8 @@ var label = $(line).find('input[data-id="search_field_name"]').val(); if ( name.length > 0 && label.length > 0 ) { var new_line = clone_line( line ); - new_line.appendTo($('table[data-index_name=search_fields]>tbody')); + new_line.appendTo(table.find('tbody')); clean_line(line); - - $(table).tableDnD( { - onDragClass: "dragClass", - } ); } }); }); @@ -213,6 +203,7 @@ a.add, a.delete { Staff client OPAC   +   @@ -296,7 +287,7 @@ a.add, a.delete { - [% IF search_field.mapped_biblios %] + [% IF search_field.is_mapped_biblios %] [% ELSE %] @@ -309,7 +300,6 @@ a.add, a.delete { Delete [% END %] - [% END %] -- 2.7.4