Attachment 155650 Details for Bug 16223 – Bug 16223: (QA follow-up) Add filter, remove superfluous condition

[patch] Bug 16223: (QA follow-up) Add filter, remove superfluous condition

Bug-16223-QA-follow-up-Add-filter-remove-superfluo.patch (text/plain), 1.98 KB, created by Marcel de Rooy on 2023-09-15 09:19:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2023-09-15 09:19:21 UTC

Size: 1.98 KB

patch

obsolete

>From 2ba300219f09a5743db551752e94e86b454545ea Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 15 Sep 2023 09:01:06 +0000
>Subject: [PATCH] Bug 16223: (QA follow-up) Add filter, remove superfluous
> condition
>Content-Type: text/plain; charset=utf-8
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> admin/restrictions.pl                                         | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/admin/restrictions.pl b/admin/restrictions.pl
>index a1a0bc1bdf..4831331699 100755
>--- a/admin/restrictions.pl
>+++ b/admin/restrictions.pl
>@@ -66,7 +66,7 @@ if ( $op eq 'add_form') {
>                 display_text => $display_text,
>             }
>         );
>-        if ($dupe->count && $dupe->unblessed->{code} ne $code) {
>+        if ( $dupe->count ) {
>             push @messages, {
>                 type => 'error', code => 'duplicate_display_text'
>             };
>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 93cf49f5e4..ff3ee00fab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt
>@@ -214,7 +214,7 @@
>                                 [% IF restriction.lift_after_payment %]Yes[% END %]
>                             </td>
>                             <td>
>-                                [% IF restriction.fee_limit %][% restriction.fee_limit %][% END %]
>+                                [% IF restriction.fee_limit %][% restriction.fee_limit | html %][% END %]
>                             </td>
>                             <td class="actions">
>                                 <a class="btn btn-default btn-xs" href="/cgi-bin/koha/admin/restrictions.pl?op=add_form&amp;code=[% restriction.code | uri %]"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 16223: 50078 | 50084 | 99697 | 99698 | 104399 | 104400 | 114272 | 114273 | 118526 | 118572 | 118574 | 118575 | 122768 | 122769 | 127252 | 128005 | 132284 | 132285 | 132286 | 132287 | 143388 | 143389 | 143390 | 143462 | 143670 | 143671 | 143672 | 143688 | 143689 | 143690 | 143765 | 143766 | 143767 | 143768 | 143769 | 143770 | 143936 | 146051 | 146052 | 146053 | 146054 | 146055 | 146056 | 146057 | 148307 | 148308 | 148309 | 148310 | 148311 | 148312 | 148313 | 150024 | 150025 | 150026 | 150027 | 150028 | 150029 | 153024 | 153025 | 153026 | 153027 | 153028 | 153029 | 155644 | 155645 | 155646 | 155647 | 155648 | 155649 | 155650 | 156841 | 156842 | 156843 | 156844 | 156845 | 156846 | 156847 | 156848 | 156849 | 156850