Attachment 166672 Details for Bug 34597 – Bug 34597: (follow-up) Update system preference description and order of options

[patch] Bug 34597: (follow-up) Update system preference description and order of options

Bug-34597-follow-up-Update-system-preference-descr.patch (text/plain), 3.36 KB, created by David Nind on 2024-05-14 07:21:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-05-14 07:21:31 UTC

Size: 3.36 KB

patch

obsolete

>From 066609ce698b4698bc79df4709c7342cca9a723e Mon Sep 17 00:00:00 2001
>From: David Nind <david@davidnind.com>
>Date: Tue, 14 May 2024 07:15:24 +0000
>Subject: [PATCH] Bug 34597: (follow-up) Update system preference description
> and order of options
>
>Update the note for the BlockExpiredPatronOpacActions system preference to
>make it clearer, and to follow the standard convention for notes.
>
>Order of options for 'Block expired patron OPAC actions' when editing the
>patron category changed to alpabetical order, to match the system preference
>order.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../intranet-tmpl/prog/en/modules/admin/categories.tt  | 10 +++++-----
> .../prog/en/modules/admin/preferences/opac.pref        |  2 +-
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index d1285f6d5b..5f6b18fe8b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -356,16 +356,16 @@
>                         [% ELSE %]
>                             <option value="hold"> Placing a hold on an item </option>
>                         [% END %]
>-                        [% IF category and category.BlockExpiredPatronOpacActions_contains('renew') %]
>-                            <option value="renew" selected="selected"> Renewing an item </option>
>-                        [% ELSE %]
>-                            <option value="renew"> Renewing an item </option>
>-                        [% END %]
>                         [% IF category and category.BlockExpiredPatronOpacActions_contains('ill_request') %]
>                             <option value="ill_request" selected="selected"> Placing an ILL request </option>
>                         [% ELSE %]
>                             <option value="ill_request"> Placing an ILL request </option>
>                         [% END %]
>+                        [% IF category and category.BlockExpiredPatronOpacActions_contains('renew') %]
>+                            <option value="renew" selected="selected"> Renewing an item </option>
>+                        [% ELSE %]
>+                            <option value="renew"> Renewing an item </option>
>+                        [% END %]
>                         </optgroup>
>                     </select>
>                     <div class="hint">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>index 19df998403..513c3967c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
>@@ -646,7 +646,7 @@ OPAC:
>                   renew: "Renewing an item"
>                   hold: "Placing a hold on an item"
>                   ill_request: "Placing an ILL request"
>-            - "<p>Please note: OPAC actions blocked based on the patron category take priority over this preference.</p>"
>+            - "<p><strong>NOTE:</strong> OPAC actions blocked using the patron category setting take priority over this system preference.</p>"
>         -
>             - The cleanup_database.pl cronjob automatically deletes unaccepted private list share invites after
>             - pref: PurgeListShareInvitesOlderThan
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 34597: 164052 | 164053 | 164054 | 164055 | 165415 | 165416 | 165417 | 165418 | 166563 | 166564 | 166668 | 166669 | 166670 | 166671 | 166672 | 167481 | 167482 | 167483 | 167484 | 167485 | 167486