From d9f7769909988bfe39b2b602357f58d36996ec6e Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Mon, 23 Sep 2019 10:25:13 +0000
Subject: [PATCH] Bug 22744: Changes for opac and remove JS

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 87302a1abfe9d44bf302ee9ce83ec0639ea4f849)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 231d71d4270f7e400e2c354ef25cdf98fd7421e8)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/js/messaging-preference-form.js       | 18 ------------------
 .../bootstrap/en/modules/opac-messaging.tt     |  6 ++----
 2 files changed, 2 insertions(+), 22 deletions(-)

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..ea01a62d80 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
@@ -1,21 +1,4 @@
 $(document).ready(function(){
-    $(".none").click(function(){
-        if($(this).prop("checked")){
-            var rowid = $(this).attr("id");
-            var newid = Number(rowid.replace("none",""));
-            $("#sms"+newid).prop("checked", false);
-            $("#email"+newid).prop("checked", false);
-            $("#phone"+newid).prop("checked", false);
-            $("#digest"+newid).prop("checked", false);
-            $("#rss"+newid).prop("checked", false);
-        }
-    });
-    $(".active_notify").on("change",function(){
-        var attr_id = $(this).data("attr-id");
-        if( $(this).prop("checked") ){
-            $("#none" + attr_id ).prop("checked", false);
-        }
-    });
     $("#info_digests").tooltip();
 
     var message_prefs_dirty = false;
@@ -36,7 +19,6 @@ $(document).ready(function(){
                     return;
                 }
             }
-            $(".none").prop("checked", false); // When loading default prefs the "Do not notify" 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 e6e8ce9f04..82f22551cf 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,6 @@
                                         [% 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>RSS</th> --><th>Do not notify</th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -70,9 +69,9 @@
                                             [% IF ( messaging_preference.transport_sms ) %]
                                                 <td>
                                                     [% IF ( messaging_preference.transports_sms ) %]
-                                                      <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
+                                                      <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
                                                     [% ELSE %]
-                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
+                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
                                                     [% END %]
                                                 </td>
                                             [% ELSE %]
@@ -123,7 +122,6 @@
                                         <td>-</td>
                                         [% END %]
 
-                                        <td><input type="checkbox" class="none" id="none[% messaging_preference.message_attribute_id | html %]" /></td>
                                     </tr>
                                 [% END # / FOREACH messaging_preferences%]
                             </tbody>
-- 
2.39.5