Bug 18532: (follow-up) Fix rebasing issue
authorTomas Cohen Arazi <tomascohen@theke.io>
Fri, 12 Mar 2021 14:38:04 +0000 (11:38 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 16 Mar 2021 15:08:31 +0000 (16:08 +0100)
commit5ba6200191ff6c80bebf4c4738cb1174c29f8280
tree87b33bc4b6f113a14f987ae1315a2bd37b56982e
parentbc0ee173df096c1e7811581921d999c3e9ea6ca1
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>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt