Attachment 126537 Details for Bug 22785 – Bug 22785: (follow-up) Don't sort by chosen and fix selection of matches

[patch] Bug 22785: (follow-up) Don't sort by chosen and fix selection of matches

Bug-22785-follow-up-Dont-sort-by-chosen-and-fix-se.patch (text/plain), 2.74 KB, created by Benjamin Daeuber on 2021-10-19 20:23:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Daeuber

Created: 2021-10-19 20:23:28 UTC

Size: 2.74 KB

patch

obsolete

>From fd2721f786be1e1cb9dad82cc1c5e409eec2d61b Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Wed, 19 May 2021 10:54:49 +0000
>Subject: [PATCH] Bug 22785: (follow-up) Don't sort by chosen and fix selection
> of matches
>
>Previously the sorting took 'chosen' into account and would move a selected match to the
>top on next load - it is better to preserve the same sorting every time
>
>When loading matches the 'cehcked' variable was not being cleared, so multiple matches were
>being marked 'checked="checked"'. Fixing this ensures the correct record displays as chosen
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>---
> C4/ImportBatch.pm                                               | 2 +-
> .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt   | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm
>index c81ad2cd2c..e079a41997 100644
>--- a/C4/ImportBatch.pm
>+++ b/C4/ImportBatch.pm
>@@ -1476,7 +1476,7 @@ sub GetImportRecordMatches {
>                                     JOIN import_record_matches USING (import_record_id)
>                                     LEFT JOIN biblio ON (biblionumber = candidate_match_id)
>                                     WHERE import_record_id = ?
>-                                    ORDER BY score DESC, chosen DESC, biblionumber DESC");
>+                                    ORDER BY score DESC, biblionumber DESC");
>     $sth->bind_param(1, $import_record_id);
>     my $results = [];
>     $sth->execute();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index 672358bd17..61dc45d050 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -582,8 +582,8 @@
>                                 );
>                                 $('td:eq(5) ul', nRow).append('<li><a href="'
>                                         + diff_url.format( [% import_batch_id | html %], aData['import_record_id'], item.candidate_match_id, item.record_type) + '">' + _("View") + '</a></li>');
>+                                checked = "";
>                             });
>-                            checked = "";
>                             if( !any_checked ){ checked = 'checked="checked"'; }
>                             $('td:eq(4) ul', nRow).prepend('<li><label><input type="radio" data-import_record_id="'+aData['import_record_id']+'" class="chosen" name="import_record_id_'+aData['import_record_id']+'_match" value="none" ' + checked + disabled + ' > Ignore matches</label></li>');
>                             $('td:eq(5) ul', nRow).prepend('<li>&nbsp;</li>');
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22785: 114813 | 114814 | 114815 | 114816 | 120995 | 120996 | 120997 | 121149 | 121167 | 121168 | 121169 | 121170 | 121171 | 121172 | 121173 | 121174 | 121204 | 121205 | 121206 | 121207 | 126369 | 126370 | 126371 | 126372 | 126522 | 126523 | 126524 | 126525 | 126531 | 126532 | 126533 | 126534 | 126535 | 126536 | 126537 | 126538 | 128820 | 128821 | 128822 | 128823 | 128824 | 130726 | 130727 | 130728 | 130729 | 130730 | 131143 | 131144 | 131145 | 131146 | 131147 | 133947 | 133948 | 133949 | 133950 | 133951 | 134127 | 134128 | 134129 | 134130 | 134131 | 134132 | 134219 | 134368 | 134369 | 134370 | 134371 | 134372 | 134373 | 134374 | 134575 | 134608