Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 13613: (follow-up) Use more unique classes

Browse source 
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>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Nick Clemens 2021-03-17 13:49:25 +00:00 committed by Jonathan Druart
parent 4d15224c78
commit a6e66b560b
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
View file

@ -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>

8
koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
View file

@ -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") ) {

14
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
View file

@ -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") ) {