Bugzilla – Attachment 120739 Details for
Bug 13613
Don't allow digest to be selected without a digest-able transport selected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13613: (follow-up) Use more unique classes
Bug-13613-follow-up-Use-more-unique-classes.patch (text/plain), 12.86 KB, created by
Katrin Fischer
on 2021-05-09 12:44:48 UTC
(
hide
)
Description:
Bug 13613: (follow-up) Use more unique classes
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2021-05-09 12:44:48 UTC
Size:
12.86 KB
patch
obsolete
>From a5ba70a9db2748b14bf02f1eda16235d279988ea Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 17 Mar 2021 13:49:25 +0000 >Subject: [PATCH] Bug 13613: (follow-up) Use more unique classes > >This resolves the issue of being unable to save email as it was being hit by the validator > >Signed-off-by: Owen Leonard <oleonard@myacpl.org> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../prog/en/includes/messaging-preference-form.inc | 24 +++++++++++----------- > .../prog/js/messaging-preference-form.js | 8 ++++---- > .../bootstrap/en/modules/opac-messaging.tt | 14 ++++++------- > 3 files changed, 23 insertions(+), 23 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 be4119c7a5..9340384f7c 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 >@@ -56,24 +56,24 @@ > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" class="sms" checked="checked" disabled="disabled" /> >+ value="sms" class="pmp_sms" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" class="sms" disabled="disabled" /> >+ value="sms" class="pmp_sms" disabled="disabled" /> > [% END %] > [% ELSE %] > [% 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" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="sms" checked="checked" class="pmp_sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="sms" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="sms" class="pmp_sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >@@ -155,24 +155,24 @@ > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" class="email" checked="checked" disabled="disabled" /> >+ value="email" class="pmp_email" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" class="email" disabled="disabled" /> >+ value="email" class="pmp_email" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.transports_email ) %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" checked="checked" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="email" checked="checked" class="pmp_email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id | html %]" > name="[% messaging_preference.message_attribute_id | html %]" >- value="email" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ value="email" class="pmp_email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >@@ -187,24 +187,24 @@ > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="digest" checked="checked" disabled="disabled" /> >+ name="digest" class="pmp_digest" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="digest" disabled="disabled" /> >+ name="digest" class="pmp_digest" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.digest ) %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" checked="checked" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id | html %]" > value="[% messaging_preference.message_attribute_id | html %]" >- name="digest" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> >+ name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" /> > [% END %] > [% END %] > </td> >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 920a9f7926..0196d6e1b3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js >@@ -49,7 +49,7 @@ $(document).ready(function(){ > } > > // At load time, we want digest disabled if no digest using transport is enabled >- $("#memberentry_messaging_prefs .email").each(function(){ >+ $(".pmp_email").each(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >@@ -60,16 +60,16 @@ $(document).ready(function(){ > }); > > // If user clears all digest using transports for a notice, disable digest checkbox >- $(".email").click(function(){ >+ $(".pmp_email").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { > $("#digest"+id).attr("disabled", false); > } else { >- $("#digest"+id).attr("disabled", true); >+ $("#digest"+id).attr("disabled", true).prop("checked",false); > } > }); >- $(".sms").click(function(){ >+ $(".pmp_sms").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("sms","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >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 e1faabeac8..a8c714950f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -89,9 +89,9 @@ > [% IF ( messaging_preference.transport_sms ) %] > <td class="selectcol"> > [% IF ( messaging_preference.transports_sms ) %] >- <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" /> >+ <input type="checkbox" class="pmp_sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" /> > [% ELSE %] >- <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" /> >+ <input type="checkbox" class="pmp_sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" /> > [% END %] > </td> > [% ELSE %] >@@ -144,9 +144,9 @@ > [% IF ( messaging_preference.transport_email ) %] > <td class="selectcol"> > [% IF ( messaging_preference.transports_email ) %] >- <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" /> >+ <input type="checkbox" class="pmp_email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" /> > [% ELSE %] >- <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" /> >+ <input type="checkbox" class="pmp_email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" /> > [% END %] > </td> > [% ELSE %] >@@ -251,7 +251,7 @@ > $("#info_digests").tooltip(); > > // At load time, we want digest disabled if no digest using transport is enabled >- $(".email").each(function(){ >+ $(".pmp_email").each(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >@@ -262,7 +262,7 @@ > }); > > // If user clears all digest using transports for a notice, disable digest checkbox >- $(".email").click(function(){ >+ $(".pmp_email").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("email","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >@@ -271,7 +271,7 @@ > $("#digest"+id).attr("disabled", true).prop("checked",false); > } > }); >- $(".sms").click(function(){ >+ $(".pmp_sms").click(function(){ > var rowid = $(this).attr("id"); > id = Number(rowid.replace("sms","")); > if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) { >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13613
:
35471
|
118379
|
118380
|
118381
|
118648
|
118742
|
119331
|
119332
|
119333
|
120081
|
120737
|
120738
| 120739 |
120740
|
120760
|
120838