gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 bb31d99065)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit c618b787bf)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
This commit is contained in:
Lari Taskula 2017-05-31 17:03:54 +03:00 committed by Katrin Fischer
parent 12188c9834
commit b2b16f3820
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
View File

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