Attachment 63872 Details for Bug 18692 – Bug 18692: (follow-up) Fix misplaced columns and add this feature for phone as well

[patch] Bug 18692: (follow-up) Fix misplaced columns and add this feature for phone as well

Bug-18692-follow-up-Fix-misplaced-columns-and-add-.patch (text/plain), 5.64 KB, created by Lari Taskula on 2017-05-31 14:33:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lari Taskula

Created: 2017-05-31 14:33:40 UTC

Size: 5.64 KB

patch

obsolete

>From f5993346970daa22e66094821a4392445ced6189 Mon Sep 17 00:00:00 2001
>From: Lari Taskula <lari.taskula@jns.fi>
>Date: Wed, 31 May 2017 17:03:54 +0300
>Subject: [PATCH] Bug 18692: (follow-up) Fix misplaced columns and add this
> feature for phone as well
>
>Fixes misplaced columns introduced by previous patch and adds the "-" for phone
>transport type.
>
>To test:
>1. Set SMSSendDriver system preference on
>2. Go to intra and OPAC messaging preferences
>3. By default you should see checkboxes for all messages for SMS
>4. Ensure columns are not misplaced (pushing one column too much to the right)
>5. Delete sms method from one of the messages in message_transports table
>6. Observe that "-" is displayed instead of checkbox for that message for SMS
>7. Repeat same for TalkingTechItivaPhoneNotification system preference.
>   By default it may not have transports in message_transports, so make sure
>   to assign some in order to have the checkboxes visible.
>---
> .../prog/en/includes/messaging-preference-form.inc   | 20 ++++++++++++++++----
> .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt |  8 +++++++-
> 2 files changed, 23 insertions(+), 5 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 a5da438..70761a0 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
>@@ -63,7 +63,9 @@ $(document).ready(function(){
>       <td>-</td>
>       [% END %]
> 
>-      [% IF Koha.Preference('SMSSendDriver') %]<td>
>+      [% IF Koha.Preference('SMSSendDriver') %]
>+        [% IF ( messaging_preference.transport_sms ) %]
>+          <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.transports_sms ) %]
>                  <input type="checkbox"
>@@ -89,9 +91,15 @@ $(document).ready(function(){
>                  value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>-      </td>[% END %]
>+          </td>
>+        [% ELSE %]
>+          <td>-</td>
>+        [% END %]
>+      [% END %]
> 
>-      [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %]<td>
>+      [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %]
>+        [% IF ( messaging_preference.transport_phone ) %]
>+          <td>
>           [% IF ( messaging_form_inactive ) %]
>               [% IF ( messaging_preference.transports_phone ) %]
>                  <input type="checkbox"
>@@ -117,7 +125,11 @@ $(document).ready(function(){
>                  value="phone" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id %]" />
>               [% END %]
>           [% END %]
>-      </td>[% END %]
>+          </td>
>+        [% ELSE %]
>+          <td>-</td>
>+        [% END %]
>+      [% END %]
> 
>       [% IF ( messaging_preference.transport_email ) %]
>       <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 32d1416..a487750 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt
>@@ -64,6 +64,7 @@
>                                             <td>-</td>
>                                         [% END %]
>                                         [% IF ( SMSSendDriver ) %]
>+                                          [% IF ( messaging_preference.transport_sms ) %]
>                                             <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;" />
>@@ -71,10 +72,12 @@
>                                                     <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;" />
>                                                 [% END %]
>                                             </td>
>-                                        [% ELSE %]
>+                                          [% ELSE %]
>                                             <td>-</td>
>+                                          [% END %]
>                                         [% END %]
>                                         [% IF ( TalkingTechItivaPhone ) %]
>+                                            [% IF ( messaging_preference.transport_phone ) %]
>                                             <td>
>                                               [% IF ( messaging_preference.transports_phone ) %]
>                                               <input type="checkbox"
>@@ -88,6 +91,9 @@
>                                                          value="phone" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id %].checked=false;" />
>                                               [% END %]
>                                             </td>
>+                                            [% ELSE %]
>+                                            <td>-</td>
>+                                            [% END %]
>                                         [% END %]
> 
>                                         [% IF ( messaging_preference.transport_email ) %]
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 18692: 63814 | 63830 | 63872 | 63897 | 63898 | 63900 | 64409 | 64410 | 65170 | 65171 | 65451 | 65906 | 66731