From 5818fdc1ff9d0044083cf87fe8d3cd8556969172 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 19 Apr 2019 15:27:07 +0000 Subject: [PATCH] Bug 22744: Rename 'Do no notify' to 'Clear' To test: 1 - Enable enhanced messaging prefs 2 - Allow users to set their messaging on the opac 3 - Edit a patron and check 'Do not notify' 4 - Save and note the box is empty if editing again 5 - Same on opac 6 - Apply patch 7 - Repeat and note the option now says 'Clear' 8 - Confirm this makes more sense --- koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc | 2 +- koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 e0c880f652..80dbb2918b 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 @@ -11,7 +11,7 @@ Email Digests only - [% UNLESS ( messaging_form_inactive ) %]Do not notify[% END %] + [% UNLESS ( messaging_form_inactive ) %]Clear[% END %] [% FOREACH messaging_preference IN messaging_preferences %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js index 93f1ce3fbb..8cb20df7f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js +++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js @@ -36,7 +36,7 @@ $(document).ready(function(){ return; } } - $(".none").prop("checked", false); // When loading default prefs the "Do not notify" boxes should be cleared + $(".none").prop("checked", false); // When loading default prefs the "Clear" boxes should be cleared var jqxhr = $.getJSON('/cgi-bin/koha/members/default_messageprefs.pl?categorycode=' + categorycode, function(data) { $.each(data.messaging_preferences, function(i, item) { var attrid = item.message_attribute_id; 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 9f4e6f7908..04b35ccb08 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -40,7 +40,7 @@ [% IF ( TalkingTechItivaPhone ) %]Phone[% END %] Email Digests only - Do not notify + Clear -- 2.11.0