Attachment 138036 Details for Bug 17385 – Bug 17385: Correction of opac-detail-sidebar.inc

[patch] Bug 17385: Correction of opac-detail-sidebar.inc

Bug-17385-Correction-of-opac-detail-sidebarinc.patch (text/plain), 4.38 KB, created by Shi Yao Wang on 2022-07-22 14:36:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shi Yao Wang

Created: 2022-07-22 14:36:57 UTC

Size: 4.38 KB

patch

obsolete

>From d516c29e970d1ad7da18efe4a7c671479d6978c9 Mon Sep 17 00:00:00 2001
>From: The Minh Luong <theminh@inlibro.com>
>Date: Tue, 8 Mar 2022 11:20:46 -0500
>Subject: [PATCH] Bug 17385: Correction of opac-detail-sidebar.inc
>
>This patch reverts the changes made in opac-detail-sidebar.inc, so the sidebar is
>displayed as wanted. Tests are now passing properly.
>
>TEST PLAN:
>1- Apply the patch and search for a record in the OPAC.
>2- Click on "Save record". Notice that the dropdown menu is unchanged.
>3- Run t/db_dependent/XSLT.t (All tests should pass)
>---
> .../bootstrap/en/includes/opac-detail-sidebar.inc         | 8 +++-----
> t/db_dependent/XSLT.t                                     | 6 +++---
> 2 files changed, 6 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>index 5d55583297..2634b531c6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
>@@ -63,12 +63,11 @@
>             <div id="export">
>                 <div class="dropdown">
>                     <a id="format" class="btn btn-link btn-lg dropdown-toggle" data-toggle="dropdown" href="#"><i class="fa fa-fw fa-download"></i> Save record <b class="caret"></b></a>
>-                        <ul class="dropdown-menu pull-left" role="menu" aria-labelledby="format">
>+                        <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="format">
>                             [% FOREACH option IN export_options %]
>                                 [% IF option == 'dc' %]
>-                                    <li><a role="menuitem" href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a></li>
>+                                    <a role="menuitem" href="#" data-toggle="modal" data-target="#exportModal_">Dublin Core</a>
>                                 [% ELSIF option != 'custom' %]
>-                                <li>
>                                     <a role="menuitem" href="/cgi-bin/koha/opac-export.pl?op=export&amp;bib=[% biblio.biblionumber | html %]&amp;format=[% option | html %]">
>                                         [% SWITCH option %]
>                                             [% CASE 'bibtex' %]BIBTEX
>@@ -82,14 +81,13 @@
>                                             [% CASE 'isbd' %]ISBD
>                                         [% END %]
>                                     </a>
>-                                </li>
>                                 [% ELSE %]
>                                     [% FOREACH filesOption IN filesOptions %]
>                                         <li><a role="menuitem" href="/cgi-bin/koha/opac-export.pl?format=[% filesOption.format | html %]&amp;op=exportxsl&amp;file=[% filesOption.value | html %]&amp;bib=[% biblionumber | html %]">XSL - [% filesOption.filename | html %]</a></li>
>                                     [% END %]
>                                 [% END %]
>                             [% END %]
>-                        </ul>
>+                        </div>
>                 </div>
>             </div>
>         </li>
>diff --git a/t/db_dependent/XSLT.t b/t/db_dependent/XSLT.t
>index 3d0dfa4c66..d55c06bf03 100755
>--- a/t/db_dependent/XSLT.t
>+++ b/t/db_dependent/XSLT.t
>@@ -18,7 +18,7 @@
> use Modern::Perl;
> 
> use MARC::Record;
>-use Test::More tests => 4;
>+use Test::More tests =>  7;
> use Test::Warn;
> use t::lib::TestBuilder;
> use t::lib::Mocks;
>@@ -46,8 +46,8 @@ subtest  'CustomXSLTExportList: Caching' => sub {
>     push @$list, { nonsense => 1 };
>     $cache->set_in_cache( 'CustomXSLTExportListOPAC', $list );
>     my $n = @$list;
>-    $list = C4::XSLT::CustomXSLTExportList(1);
>     is( @$list, $n, 'This list comes from the cache and that is fine' );
>+    $list = C4::XSLT::CustomXSLTExportList(1);
>     $cache->clear_from_cache('CustomXSLTExportListOPAC');
> };
> 
>@@ -178,8 +178,8 @@ subtest  'CustomXSLTExportList: Caching' => sub {
>     push @$list, { nonsense => 1 };
>     $cache->set_in_cache('CustomXSLTExportListOPAC', $list );
>     my $n = @$list;
>-    $list = C4::XSLT::CustomXSLTExportList(1);
>     is( @$list, $n, 'This list comes from the cache and that is fine' );
>+    $list = C4::XSLT::CustomXSLTExportList(1);
>     $cache->clear_from_cache('CustomXSLTExportListOPAC');
> };
> subtest 'CustomXSLTExportList: Check export options' => sub {
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 17385: 55961 | 58308 | 64033 | 64034 | 67357 | 67579 | 74660 | 74661 | 79055 | 79056 | 80675 | 81385 | 81386 | 84388 | 84389 | 84390 | 86875 | 86876 | 86877 | 86878 | 86879 | 86880 | 97076 | 97101 | 97102 | 97103 | 97104 | 97105 | 100289 | 100290 | 100291 | 100292 | 100293 | 100663 | 100670 | 100671 | 100672 | 100673 | 100674 | 100675 | 112671 | 112672 | 112673 | 112674 | 112675 | 112676 | 112677 | 112678 | 112679 | 112680 | 112681 | 112682 | 112956 | 112957 | 112958 | 112959 | 130283 | 130284 | 130285 | 130286 | 130287 | 130691 | 130692 | 130693 | 130694 | 130695 | 131492 | 132488 | 132489 | 132490 | 132491 | 132492 | 132493 | 132581 | 133498 | 133499 | 133500 | 133501 | 133502 | 133503 | 133504 | 138031 | 138032 | 138033 | 138034 | 138035 | 138036 | 138037 | 138082 | 138083 | 138084 | 138085 | 138086 | 138087 | 138088 | 138132 | 139277 | 139278 | 139279 | 139280 | 139281 | 139282 | 139283 | 139284 | 141157 | 141158 | 141159 | 141160 | 141161 | 141162 | 141163 | 141164 | 144335 | 144336 | 144380 | 144384 | 151095 | 151096 | 151097 | 151098 | 151099 | 151102 | 151103 | 151104 | 151105 | 151106 | 151377 | 151378 | 151379 | 151380 | 151381 | 154379 | 154380 | 154381 | 154382 | 154383 | 156815 | 156816 | 156817 | 156818 | 156819 | 159142 | 159143 | 159144 | 159145 | 159146 | 159147 | 159148 | 163623 | 170014 | 170015 | 170016 | 170017 | 170018 | 170019 | 170026 | 170027 | 170028 | 170029 | 170030 | 170031 | 170983 | 170984 | 170985 | 170986 | 170987 | 170988