Attachment 133482 Details for Bug 30434 – Bug 30434: Convert catalog merge page tabs to Bootstrap

[patch] Bug 30434: Convert catalog merge page tabs to Bootstrap

Bug-30434-Convert-catalog-merge-page-tabs-to-Boots.patch (text/plain), 2.66 KB, created by Martin Renvoize (ashimema) on 2022-04-20 15:03:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-04-20 15:03:40 UTC

Size: 2.66 KB

patch

obsolete

>From e354270c3f09270f718679c445eec60eedc59b94 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 1 Apr 2022 14:30:49 +0000
>Subject: [PATCH] Bug 30434: Convert catalog merge page tabs to Bootstrap
>
>This patch updates the catalog merge template so that it uses Bootstrap
>tabs instead of jQueryUI. Some JavaScript is modified to accommodate the
>new DOM structure.
>
>The patch also makes a minor HTML correction, adding a missing "</ol>".
>
>To test, apply the patch and search the catalog in the staff client.
>
>- In the search results, check the checkbox for two records.
>- Choose Edit -> Merge records.
>- Click next to accept the merge reference selection.
>- On the next page you should see two tabs under "Source records."
>  Confirm that they work correctly.
>- All checkboxes in the first tab should be checked by default.
>- Confirm that tag and subfield selection still works correctly.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/cataloguing/merge.tt           | 14 ++++++++------
> 1 file changed, 8 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 537148c52a..84305e7b8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt
>@@ -31,6 +31,7 @@ div#result { margin-top: 1em; }
>                 Merging records
>             </a>
>         </li>
>+    </ol>
> </nav>
> 
> <div class="main container-fluid">
>@@ -289,13 +290,14 @@ div#result { margin-top: 1em; }
>               rebuild_target($("#tabs"), $("#resultul"));
>             });
> 
>-            // Creating tabs
>-            $("#tabs").tabs();
>+            if( $(".tab-pane.active").length < 1 ){
>+                $("#tabs a:first").tab("show");
>+            }
> 
>-            // Check all checkboxes in first tab, and uncheck all others to avoid
>-            // inconsistencies from a page refresh.
>-            $('#tabs div#tabrecord[% ref_biblionumber | html %]').find('input[type="checkbox"]').prop('checked', true);
>-            $('#tabs > div:not("#tabrecord[% ref_biblionumber | html %]")').find('input[type="checkbox"]').prop('checked', false);
>+            // Uncheck all checkboxes in both tabs, then check all checkboxes in first tab
>+            // to avoid inconsistencies from a page refresh.
>+            $("#tabs input[type='checkbox']").prop("checked", false);
>+            $("#tabrecord[% ref_biblionumber | html %] input[type='checkbox']").prop("checked", true );
> 
>             //Set focus to cataloging search
>             $("input[name=q]:eq(0)").focus();
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 30434: 132868 | 133278 | 133482