From 5ba6200191ff6c80bebf4c4738cb1174c29f8280 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi 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 Signed-off-by: Jonathan Druart --- .../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 49dbe1705c..f2a2e0f241 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 %] [% IF ( messaging_preference.takes_days ) %] 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 62ad2a78dd..49c06a348f 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 %] [% IF ( messaging_preference.takes_days ) %]