From a52fdc00df63ed7f94876d9ea01e869e495248c1 Mon Sep 17 00:00:00 2001 From: Lari Taskula 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 Signed-off-by: Nick Clemens --- .../prog/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 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(){ - [% END %] - [% IF Koha.Preference('SMSSendDriver') %] + [% IF Koha.Preference('SMSSendDriver') %] + [% IF ( messaging_preference.transport_sms ) %] + [% IF ( messaging_form_inactive ) %] [% IF ( messaging_preference.transports_sms ) %] [% END %] [% END %] - [% END %] + + [% ELSE %] + - + [% END %] + [% END %] - [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %] + [% IF Koha.Preference('TalkingTechItivaPhoneNotification') %] + [% IF ( messaging_preference.transport_phone ) %] + [% IF ( messaging_form_inactive ) %] [% IF ( messaging_preference.transports_phone ) %] [% END %] [% END %] - [% END %] + + [% ELSE %] + - + [% END %] + [% END %] [% IF ( messaging_preference.transport_email ) %] -- 2.1.4