Bugzilla – Attachment 35471 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 - Don't allow digest to be selected without a digest-able transport selected
Bug-13613---Dont-allow-digest-to-be-selected-witho.patch (text/plain), 16.10 KB, created by
Kyle M Hall (khall)
on 2015-01-22 17:40:38 UTC
(
hide
)
Description:
Bug 13613 - Don't allow digest to be selected without a digest-able transport selected
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-01-22 17:40:38 UTC
Size:
16.10 KB
patch
obsolete
>From 2b4410413df293cd4bc8f7c6ff0d57748bc59cd8 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 22 Jan 2015 12:36:31 -0500 >Subject: [PATCH] Bug 13613 - Don't allow digest to be selected without a digest-able transport selected > >By default, only the email transport is enabled. This gives the >messaging preferences the look of having email and digest and two >options. I.E. to some users it appears that you check email for single >emails, *or* you check digest for a digest email. > >To help remove this possible confusion, the digest mode checkbox should >be disabled if no digest-able transports are checked for a given notice. > >Test Plan: >1) Apply this patch >2) For both the staff interface and the opac, note that the digest checkbox > is disabled any time that no digest enabled transport ( email, sms if enabled ) > is checked for the patron editor. >--- > .../prog/en/includes/messaging-preference-form.inc | 82 ++++++++++++++------ > .../bootstrap/en/modules/opac-messaging.tt | 45 +++++++++-- > 2 files changed, 96 insertions(+), 31 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 3b7bb50..f3293ed 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 >@@ -1,18 +1,50 @@ > <!-- snippet for form to set borrower and patron category messaging preferences --> > <script type="text/javascript">//<![CDATA[ >- $(document).ready(function(){ >- $(".none").click(function(){ >- if($(this).attr("checked")){ >- var rowid = $(this).attr("id"); >- newid = Number(rowid.replace("none","")) >- $("#sms"+newid).removeAttr("checked"); >- $("#email"+newid).removeAttr("checked"); >- $("#phone"+newid).removeAttr("checked"); >- $("#digest"+newid).removeAttr("checked"); >- $("#rss"+newid).removeAttr("checked"); >- } >- }); >- }); >+$(document).ready(function(){ >+ $(".none").click(function(){ >+ if($(this).attr("checked")){ >+ var rowid = $(this).attr("id"); >+ newid = Number(rowid.replace("none","")) >+ $("#sms"+newid).removeAttr("checked"); >+ $("#email"+newid).removeAttr("checked"); >+ $("#phone"+newid).removeAttr("checked"); >+ $("#digest"+newid).removeAttr("checked"); >+ $("#rss"+newid).removeAttr("checked"); >+ } >+ }); >+ >+ // At load time, we want digest disabled if no digest using transport is enabled >+ $(".email").each(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ >+ // If user clears all digest using transports for a notice, disable digest checkbox >+ $(".email").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ $(".sms").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("sms","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ >+}); > //]]> > </script> > >@@ -60,24 +92,24 @@ > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" checked="checked" disabled="disabled" /> >+ value="sms" class="sms" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" disabled="disabled" /> >+ value="sms" class="sms" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.transports_sms ) %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ value="sms" class="sms" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% ELSE %] > <input type="checkbox" > id="sms[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ value="sms" class="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% END %] > [% END %] > </td>[% END %] >@@ -117,24 +149,24 @@ > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" checked="checked" disabled="disabled" /> >+ value="email" class="email" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" disabled="disabled" /> >+ value="email" class="email" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.transports_email ) %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ value="email" class="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% ELSE %] > <input type="checkbox" > id="email[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ value="email" class="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% END %] > [% END %] > </td> >@@ -149,24 +181,24 @@ > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id %]" > value="[% messaging_preference.message_attribute_id %]" >- name="digest" checked="checked" disabled="disabled" /> >+ name="digest" class="digest" checked="checked" disabled="disabled" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id %]" > value="[% messaging_preference.message_attribute_id %]" >- name="digest" disabled="disabled" /> >+ name="digest" class="digest" disabled="disabled" /> > [% END %] > [% ELSE %] > [% IF ( messaging_preference.digest ) %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id %]" > value="[% messaging_preference.message_attribute_id %]" >- name="digest" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ name="digest" class="digest" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% ELSE %] > <input type="checkbox" > id="digest[% messaging_preference.message_attribute_id %]" > value="[% messaging_preference.message_attribute_id %]" >- name="digest" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> >+ name="digest" class="digest" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').removeAttr('checked');" /> > [% END %] > [% END %] > </td> >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 c13adc4..7a6e988 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt >@@ -57,9 +57,9 @@ > [% IF ( SMSSendDriver ) %] > <td> > [% IF ( messaging_preference.transports_sms ) %] >- <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" class="sms" value="sms" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% ELSE %] >- <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ <input type="checkbox" id="sms[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" class="sms" value="sms" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% END %] > </td> > [% END %] >@@ -70,12 +70,12 @@ > <input type="checkbox" > id="phone[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="phone" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ class="phone" value="phone" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% ELSE %] > <input type="checkbox" > id="phone[% messaging_preference.message_attribute_id %]" > name="[% messaging_preference.message_attribute_id %]" >- value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ class="phone" value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% END %] > </td> > [% END %] >@@ -83,9 +83,9 @@ > [% IF ( messaging_preference.transport_email ) %] > <td> > [% IF ( messaging_preference.transports_email ) %] >- <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" class="email" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% ELSE %] >- <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> >+ <input type="checkbox" id="email[% messaging_preference.message_attribute_id %]" name="[% messaging_preference.message_attribute_id %]" class="email" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" /> > [% END %] > </td> > [% ELSE %] >@@ -129,6 +129,7 @@ > [% BLOCK jsinclude %] > <script type="text/javascript">//<![CDATA[ > $(document).ready(function(){ >+ > $(".none").click(function(){ > if($(this).attr("checked")){ > var rowid = $(this).attr("id"); >@@ -139,6 +140,38 @@ > $("#rss"+newid).removeAttr("checked"); > } > }); >+ >+ // At load time, we want digest disabled if no digest using transport is enabled >+ $(".email").each(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ >+ // If user clears all digest using transports for a notice, disable digest checkbox >+ $(".email").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("email","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ $(".sms").click(function(){ >+ var rowid = $(this).attr("id"); >+ id = Number(rowid.replace("sms","")); >+ if ( $("#email"+id).attr("checked") || $("#sms"+id).attr("checked") ) { >+ $("#digest"+id).attr("disabled", false); >+ } else { >+ $("#digest"+id).attr("disabled", true); >+ } >+ }); >+ > }); > //]]> > </script> >-- >1.7.2.5
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