Attachment 92642 Details for Bug 22744 – Bug 22744: Rename 'Do no notify' to 'Clear'

[patch] Bug 22744: Rename 'Do no notify' to 'Clear'

Bug-22744-Rename-Do-no-notify-to-Clear.patch (text/plain), 3.68 KB, created by Kyle M Hall (khall) on 2019-09-06 13:19:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2019-09-06 13:19:05 UTC

Size: 3.68 KB

patch

obsolete

>From 28dc1b4972448c628b31158b399b404ee5e5871b Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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
>
>Signed-off-by: Liz Rea <wizzyrea@gmail.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> .../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 @@
>         <th>Email</th>
>         <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
>         
>-        [% UNLESS ( messaging_form_inactive ) %]<th>Do not notify</th>[% END %]
>+        [% UNLESS ( messaging_form_inactive ) %]<th>Clear</th>[% END %]
>     </tr>
>     [% FOREACH messaging_preference IN messaging_preferences %]
>     <tr>
>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 fdd5571580..cab3ac5985 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 ) %]<th>Phone</th>[% END %]
>                                         <th>Email</th>
>                                         <th>Digests only <i id="info_digests" data-toggle="tooltip" title="You can ask for a digest to reduce the number of messages. Messages will be saved and sent as a single message." data-placement="right" class="fa fa-info-circle"></i></th>
>-                                        <th>Do not notify</th>
>+                                        <th>Clear</th>
>                                     </tr>
>                                 </thead>
>                                 <tbody>
>-- 
>2.20.1 (Apple Git-117)

Actions: View | Diff | Splinter Review

Attachments on bug 22744: 88357 | 88534 | 88535 | 90454 | 90568 | 90569 | 90570 | 90571 | 90572 | 90574 | 92642 | 92643 | 92644 | 92645 | 92646 | 92647 | 93109 | 93114 | 93115