Bugzilla – Attachment 98015 Details for
Bug 20388
Ability to add search fields from UI
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20388: QA fixes: - pass search field objects in template instead of unblessed ones - disable drag n drop
Bug-20388-QA-fixes---pass-search-field-objects-in-.patch (text/plain), 4.57 KB, created by
Alex Arnaud
on 2020-01-28 08:15:09 UTC
(
hide
)
Description:
Bug 20388: QA fixes: - pass search field objects in template instead of unblessed ones - disable drag n drop
Filename:
MIME Type:
Creator:
Alex Arnaud
Created:
2020-01-28 08:15:09 UTC
Size:
4.57 KB
patch
obsolete
>From 4b826748ca227ed33ce468f1714697cf17de6d82 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 > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >Signed-off-by: Michal Denar <black23@gmail.com> >--- > 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 { > <th>Staff client</th> > <th>OPAC</th> > <th> </th> >+ <th> </th> > </tr> > </thead> > <tbody> >@@ -296,7 +287,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=""> >@@ -309,7 +300,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
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 20388
:
73158
|
73165
|
73167
|
73476
|
73626
|
73627
|
73629
|
73681
|
73682
|
73918
|
73919
|
73940
|
73943
|
73944
|
73945
|
73946
|
74261
|
74718
|
74719
|
78658
|
78659
|
80709
|
86912
|
87196
|
87197
|
87198
|
87199
|
87201
|
87202
|
87203
|
87204
|
88075
|
88079
|
88080
|
88081
|
88082
|
88083
|
89117
|
89118
|
89121
|
89733
|
89894
|
90517
|
90518
|
90519
|
90520
|
90521
|
90522
|
90523
|
90524
|
98011
|
98012
|
98013
|
98014
|
98015
|
98016
|
98017
|
98018
|
99960
|
99961
|
99962
|
99963
|
99964
|
99965
|
99966
|
99967
|
119296
|
119317
|
119318
|
120104
|
163449
|
163450
|
163451
|
163452
|
163460
|
163461
|
163462
|
163463
|
164529
|
164530
|
164531
|
164532
|
164533
|
164534
|
164535
|
164789
|
164790
|
164791
|
164792
|
164793