Attachment 149865 Details for Bug 32721 – Bug 32721: (QA follow up) - fix QA issues

[patch] Bug 32721: (QA follow up) - fix QA issues

Bug-32721-QA-follow-up---fix-QA-issues.patch (text/plain), 3.60 KB, created by Matt Blenkinsop on 2023-04-19 10:46:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2023-04-19 10:46:15 UTC

Size: 3.60 KB

patch

obsolete

>From fb083527f49c9e9b2e5921d865491b71df11b31b Mon Sep 17 00:00:00 2001
>From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>Date: Fri, 27 Jan 2023 14:46:44 +0000
>Subject: [PATCH] Bug 32721: (QA follow up) - fix QA issues
>
>This patches addresses issues raised by the QA tests. It also adds a missed import of the Branches file in the document head
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt    | 4 ++--
> koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 1 +
> t/db_dependent/Template/Plugin/Branches.t                    | 2 +-
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 51a8ff883a..e35e16d0a4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -281,7 +281,7 @@ Libraries &rsaquo; Administration &rsaquo; Koha
>                     <label for="UserJS">UserJS: </label>
>                     <div style="display:flex; flex-direction:column;">
>                         <a class="expand-textarea" id="expand_userjs" data-target="userjs" data-syntax="javascript" href="#">Click to edit</a>
>-                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs %]</textarea>
>+                        <textarea style="display:none" name="userjs" id="userjs" class="codemirror" rows="10" cols="40">[% library.userjs | html %]</textarea>
>                         <a class="collapse-textarea" id="collapse_userjs" data-target="userjs" data-syntax="javascript" style="display:none" href="#">Click to collapse</br></a>
>                     </div>
>                 </li>
>@@ -289,7 +289,7 @@ Libraries &rsaquo; Administration &rsaquo; Koha
>                     <label for="UserCSS">UserCSS: </label>
>                     <div style="display:flex; flex-direction:column;">
>                         <a class="expand-textarea" id="expand_usercss" data-target="usercss" data-syntax="css" href="#">Click to edit</a>
>-                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss %]</textarea>
>+                        <textarea style="display:none" name="usercss" id="usercss" class="" rows="10" cols="40">[% library.usercss | html %]</textarea>
>                         <a class="collapse-textarea" id="collapse_usercss" data-target="usercss" data-syntax="css" style="display:none" href="#">Click to collapse</br></a>
>                     </div>
>                 </li>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>index 1752ccdc8f..20fe9480d5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>@@ -1,5 +1,6 @@
> [% USE raw %]
> [% USE Koha %]
>+[% USE Branches %]
> [%- USE KohaPlugins -%]
> [% USE Asset %]
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>diff --git a/t/db_dependent/Template/Plugin/Branches.t b/t/db_dependent/Template/Plugin/Branches.t
>index fe23f00875..47722038ad 100755
>--- a/t/db_dependent/Template/Plugin/Branches.t
>+++ b/t/db_dependent/Template/Plugin/Branches.t
>@@ -218,7 +218,7 @@ subtest 'pickup_locations() tests' => sub {
>     $schema->storage->txn_rollback;
> };
> 
>-subtest 'branch specfic js and css' => sub {
>+subtest 'branch specific js and css' => sub {
> 
>     plan tests => 2;
> 
>-- 
>2.37.1 (Apple Git-137.1)

Actions: View | Diff | Splinter Review

Attachments on bug 32721: 145731 | 145732 | 145733 | 145734 | 145735 | 145754 | 145759 | 146159 | 146160 | 146161 | 146162 | 146163 | 146164 | 147373 | 149860 | 149861 | 149862 | 149863 | 149864 | 149865 | 149866 | 150713 | 150724 | 150725 | 150726 | 150727 | 150728 | 150729 | 150730 | 150731 | 150732 | 150754 | 150755 | 150756 | 150757 | 150758 | 156157 | 156158 | 156159 | 156160 | 156161 | 156162 | 156163 | 156164 | 157335