From b2b16f3820d9d2e4ef26a2b5c4dc4e551fbad576 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 - intranet part

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 intranet 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.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit bb31d99065c468fbec2443cd15894b03657a24d5)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit c618b787bf98e6b9c8004694cfd066e936760191)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../en/includes/messaging-preference-form.inc | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 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 a5da438d7c..70761a06fb 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>
-- 
2.39.5