Attachment 143762 Details for Bug 31095 – Bug 31095: (QA follow-up) Fix after rebase

[patch] Bug 31095: (QA follow-up) Fix after rebase

Bug-31095-QA-follow-up-Fix-after-rebase.patch (text/plain), 3.63 KB, created by Martin Renvoize (ashimema) on 2022-11-11 08:35:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-11-11 08:35:39 UTC

Size: 3.63 KB

patch

obsolete

>From b34d1c6c3c87aab6d59963b145ee455ed8d38d00 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 18 Oct 2022 15:01:02 +0100
>Subject: [PATCH] Bug 31095: (QA follow-up) Fix after rebase
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../prog/en/modules/admin/restrictions.tt         | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>index b179a158fa..0a2855af88 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>@@ -1,10 +1,11 @@
> [% USE raw %]
> [% USE Asset %]
> [% USE Koha %]
>+[% PROCESS 'restriction-types.inc' %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description %]'[% ELSE %]New restriction[% END %][% END %]
>-[% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description %]'[% END %] &rsaquo; Patron restrictions &rsaquo; Administration &rsaquo; Koha
>+<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'[% ELSE %]New restriction[% END %][% END %]
>+[% IF op == 'delete_confirm' %]Confirm deletion of restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'[% END %] &rsaquo; Patron restrictions &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>@@ -37,7 +38,7 @@
>         [% IF restriction %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    Modify restriction '[% PROCESS restriction_type_description %]'
>+                    Modify restriction '[% PROCESS restriction_type_description restriction_type=restriction %]'
>                 </a>
>             </li>
>         [% ELSE %]
>@@ -68,7 +69,7 @@
>             <main>
> 
> [% FOR m IN messages %]
>-    <div class="dialog [% m.type | html %]">
>+    <div class="dialog [% m | html %]">
>         [% SWITCH m.code %]
>         [% CASE 'add_success' %]
>             Type added
>@@ -95,7 +96,7 @@
>         <input type="hidden" name="op" value="add_validate" />
>         <input type="hidden" name="checked" value="0" />
>         [% IF restriction %]
>-            <h1>Modify restriction [% PROCESS restriction_type_description %]</h1>
>+            <h1>Modify restriction [% PROCESS restriction_type_description restriction_type=restriction %]</h1>
>             <input type="hidden" name="is_a_modif" value="1" />
>         [% ELSE %]
>             <h1>New restriction</h1>
>@@ -141,7 +142,7 @@
>                 Confirm restriction deletion
>             </legend>
> 
>-            <p>Are you sure you want to delete "[% PROCESS restriction_type_description %]"?</p>
>+            <p>Are you sure you want to delete "[% PROCESS restriction_type_description restriction_type=restriction %]"?</p>
> 
>             <fieldset class="action">
>                 <input type="hidden" name="op" value="delete_confirmed" />
>@@ -181,7 +182,7 @@
>                                 [% restriction.code | html %]
>                             </td>
>                             <td>
>-                                [% PROCESS restriction_type_description %]
>+                                [% PROCESS restriction_type_description restriction_type=restriction %]
>                             </td>
>                             <td>
>                                 [% IF restriction.is_default %]Yes[% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31095: 139614 | 139719 | 139720 | 139721 | 139722 | 139723 | 139724 | 139725 | 139726 | 139727 | 139728 | 139742 | 139743 | 139744 | 139745 | 139746 | 139747 | 139748 | 139749 | 139750 | 139751 | 139752 | 139753 | 139754 | 139755 | 139756 | 139757 | 139758 | 140714 | 140715 | 140716 | 140717 | 140718 | 140719 | 140720 | 140721 | 140722 | 140723 | 140724 | 140725 | 140726 | 140727 | 140728 | 140729 | 140730 | 140731 | 142059 | 142060 | 142061 | 142062 | 142063 | 142064 | 142065 | 142066 | 142067 | 142068 | 142069 | 142070 | 142071 | 142072 | 142073 | 142074 | 142075 | 142076 | 143745 | 143746 | 143747 | 143748 | 143749 | 143750 | 143751 | 143752 | 143753 | 143754 | 143755 | 143756 | 143757 | 143758 | 143759 | 143760 | 143761 | 143762 | 143763 | 144903 | 144904 | 144905 | 144906 | 144907 | 144908 | 144909 | 144910 | 144911 | 144912 | 144913 | 144914 | 144915 | 144916 | 144917 | 144918 | 144919 | 144920 | 144921 | 145800 | 145801 | 145803 | 145845