Attachment 118205 Details for Bug 18532 – Bug 18532: (follow-up) Fix rebasing issue

[patch] Bug 18532: (follow-up) Fix rebasing issue

Bug-18532-follow-up-Fix-rebasing-issue.patch (text/plain), 2.81 KB, created by Tomás Cohen Arazi (tcohen) on 2021-03-12 14:42:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2021-03-12 14:42:10 UTC

Size: 2.81 KB

patch

obsolete

>From 846dc9729a0358100c4a23b30f0d45fca6931058 Mon Sep 17 00:00:00 2001
>From: Tomas Cohen Arazi <tomascohen@theke.io>
>Date: Fri, 12 Mar 2021 11:38:04 -0300
>Subject: [PATCH] Bug 18532: (follow-up) Fix rebasing issue
>
>When the ILL notices were added, a bad rebase got rid of the notice
>description in both messaging-preference-form.inc and opac-messaging.tt
>
>This patch restores that line:
>
>1. Set AutoRenewalNotices to 'according to patron...'
>2. Edit a patron category
>=> FAIL: There's an 'Unknown' label for 'Auto renewal'
>3. Look at a patron's messaging preferences
>=> FAIL: There's an 'Unknown' label for 'Auto renewal'
>4. Look at a patron's messaging preferences in OPAC
>=> FAIL: There's an 'Unknown' label for 'Auto renewal'
>5. Apply this patch
>6. Repeat 2, 3, 4
>=> SUCCESS: 'Auto renewal' is displayed as expected
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>---
> .../intranet-tmpl/prog/en/includes/messaging-preference-form.inc | 1 +
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt       | 1 +
> 2 files changed, 2 insertions(+)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>index 49dbe1705c0..f2a2e0f2418 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
>@@ -28,6 +28,7 @@
>             [% END %]
>           [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
>           [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
>+          [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal
>           [% ELSE %]Unknown [% END %]</td>
>       [% IF ( messaging_preference.takes_days ) %]
>       <td>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>index 62ad2a78ddc..49c06a348f1 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>@@ -70,6 +70,7 @@
>                                                     [% END %]
>                                                 [% ELSIF ( messaging_preference.Ill_ready ) %]Interlibrary loan ready
>                                                 [% ELSIF ( messaging_preference.Ill_unavailable ) %]Interlibrary loan unavailable
>+                                                [% ELSIF ( messaging_preference.Auto_Renewals ) %]Auto renewal
>                                                 [% ELSE %]Unknown [% END %]</td>
>                                             [% IF ( messaging_preference.takes_days ) %]
>                                                 <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 18532: 95030 | 95031 | 95337 | 95338 | 95456 | 96049 | 96050 | 96487 | 96494 | 96495 | 98078 | 98079 | 99193 | 99194 | 104880 | 104881 | 104882 | 104883 | 105500 | 105501 | 105502 | 105503 | 114316 | 115798 | 115799 | 115800 | 115801 | 115802 | 115829 | 115830 | 115831 | 115832 | 115833 | 118198 | 118199 | 118205 | 118318 | 118329 | 118330 | 118331 | 118356