Bugzilla – Attachment 178809 Details for
Bug 39172
Merging records no longer compares side by side
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39172: Merging records no longer compares side by side
Bug-39172-Merging-records-no-longer-compares-side-.patch (text/plain), 2.58 KB, created by
Biblibre Sandboxes
on 2025-02-27 21:15:43 UTC
(
hide
)
Description:
Bug 39172: Merging records no longer compares side by side
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2025-02-27 21:15:43 UTC
Size:
2.58 KB
patch
obsolete
>From 2f130f57e350243a266bca45fd7aea9704cb5ac8 Mon Sep 17 00:00:00 2001 >From: Lisette Scheer <lisette@bywatersolutions.com> >Date: Thu, 27 Feb 2025 16:51:15 +0000 >Subject: [PATCH] Bug 39172: Merging records no longer compares side by side > >This patch updates the cataloging merge screen to restore side-by-side >comparison. > >Both columns had ids added by the patch for formatting purposes. > >To test: >1. Go to cataloging module >2. Do a search (in sandboxes/ktd 1 works) >3. Select 2 or more records to merge >4. Click the "merge selected" button >5. Observe there are 2 columns on top of each other instead of side by > side >6. Apply the patch >7. Restart all & rebuild css >8. Repeat steps 1-4 >9. Observe the columns are side by side again. >10. Sign-off > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >Signed-off-by: jason vasche <jvasche@roundrocktexas.gov> >--- > .../prog/en/modules/cataloguing/merge.tt | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >index ff2177e4e8..cbfa421a54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt >@@ -19,7 +19,10 @@ > display: block; > } > div#result { >- margin-top: 1em; >+ margin-top: 3.5rem; >+ } >+ div#mergetarget { >+ margin-top: 0.4rem; > } > /* We use this style "against" the li ui-tabs-nav style automatically applied */ > #dataPreview { >@@ -187,11 +190,11 @@ > [% ELSE %] > <form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()"> > [% INCLUDE 'csrf-token.inc' %] >- >- <div class="col-sm-6"> [% PROCESS mergesource sourcerecords=records %] </div> >- <div class="col-sm-6"> [% PROCESS mergetarget %] </div> >- <!-- .col-sm-6 --> >- >+ <div class="row"> >+ <div class="col-sm-6" id="sourcerecords"> [% PROCESS mergesource sourcerecords=records %] </div> >+ <div class="col-sm-6" id="mergetarget"> [% PROCESS mergetarget %] </div> >+ <!-- .col-sm-6 --> >+ </div> > <input type="hidden" name="ref_biblionumber" value="[% ref_biblionumber | html %]" /> > [% FOREACH record IN records %] > <input type="hidden" name="biblionumber" value="[% record.recordid | html %]" /> >-- >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 39172
:
178372
|
178800
|
178807
|
178809
|
178810
|
179098