Bugzilla – Attachment 186572 Details for
Bug 30303
Add ability to select which values to retain when merging patrons
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30303: (follow-up) Update diff highlighting instead of swapping columns
Bug-30303-follow-up-Update-diff-highlighting-inste.patch (text/plain), 2.28 KB, created by
Brendan Lawlor
on 2025-09-18 17:29:59 UTC
(
hide
)
Description:
Bug 30303: (follow-up) Update diff highlighting instead of swapping columns
Filename:
MIME Type:
Creator:
Brendan Lawlor
Created:
2025-09-18 17:29:59 UTC
Size:
2.28 KB
patch
obsolete
>From fd047906687ee622ebf7de72d3f427f029efb409 Mon Sep 17 00:00:00 2001 >From: Brendan Lawlor <blawlor@clamsnet.org> >Date: Thu, 18 Sep 2025 17:24:08 +0000 >Subject: [PATCH] Bug 30303: (follow-up) Update diff highlighting instead of > swapping columns > >This patch makes the ui more visually consistent and intuitive >--- > .../prog/en/modules/members/merge-patrons.tt | 22 +++++++++++-------- > 1 file changed, 13 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >index 0ba7575220..c50a52ae98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt >@@ -413,10 +413,10 @@ > _("Field") + > `</div> > <div class="col fw-bold">` + >- _("Keep") + >+ _("Destination record") + > `</div> > <div class="col fw-bold">` + >- _("Delete") + >+ _("Source record") + > `</div> > <div class="col fw-bold">` + > _("Copy value") + >@@ -450,13 +450,17 @@ > $("#copy-fields .row input[type=checkbox]").on("click", function () { > let ins = $(this).closest(".row").find(".col2 pre").data("og").toString(); > let del = $(this).closest(".row").find(".col3 pre").data("og").toString(); >- let diffs; >- if ($(this).is(":checked")) { >- diffs = diffString(ins, del); >- } else { >- diffs = diffString(del, ins); >- } >- $(this).closest(".row").find(".col2 pre, .col3 pre").html(diffs); >+ let diffs = diffString(ins, del); >+ >+ $(this).closest(".row").find(".col3 pre, .col2 pre").html(diffs); >+ >+ $(this) >+ .closest(".row") >+ .find(".col2, .col3") >+ .each(function () { >+ $(this).toggleClass("col2", "col3"); >+ $(this).toggleClass("col3", "col2"); >+ }); > }); > } > </script> >-- >2.39.5
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 30303
:
186382
|
186383
|
186572
|
187269
|
187295
|
187306
|
187307
|
187308
|
187309