From ee4b5bd9f5c6a210a776c820ae99c10c5701fc24 Mon Sep 17 00:00:00 2001
From: Alex Arnaud <alex.arnaud@biblibre.com>
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
---
admin/searchengine/elasticsearch/mappings.pl | 12 +-----------
.../admin/searchengine/elasticsearch/mappings.tt | 17 +++--------------
2 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/admin/searchengine/elasticsearch/mappings.pl b/admin/searchengine/elasticsearch/mappings.pl
index 298e5f7..d92ee86 100755
--- a/admin/searchengine/elasticsearch/mappings.pl
+++ b/admin/searchengine/elasticsearch/mappings.pl
@@ -211,17 +211,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 8bb0acd..ca758fe 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
@@ -32,6 +32,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
@@ -49,9 +50,6 @@
}
});
- $("table.mappings").tableDnD( {
- onDragClass: "dragClass",
- } );
$('.add').click(function() {
var table = $(this).closest('table');
var index_name = $(table).attr('data-index_name');
@@ -67,10 +65,6 @@
$(search_field_line).find('a.btn-default').addClass('disabled');
clean_line(line);
-
- $(table).tableDnD( {
- onDragClass: "dragClass",
- } );
}
});
@@ -85,12 +79,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",
- } );
}
});
});
@@ -249,7 +239,7 @@ a.add, a.delete {
</select>
</td>
<td>
- [% IF search_field.mapped_biblios %]
+ [% IF search_field.is_mapped_biblios %]
<input type="number" step="0.01" min="0.01" max="999.99" name="search_field_weight" value="[% search_field.weight | html %]" />
[% ELSE %]
<input type="hidden" name="search_field_weight" value="">
@@ -262,7 +252,6 @@ a.add, a.delete {
<a class="btn btn-default btn-xs delete" style="cursor: pointer;"><i class="fa fa-trash"></i> Delete</a>
[% END %]
</td>
- </td>
</tr>
[% END %]
</tbody>
--
2.7.4