View | Details | Raw Unified | Return to bug 18595
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-2 / +12 lines)
Lines 206-217 Link Here
206
                <input type="checkbox"
206
                <input type="checkbox"
207
                     id="digest[% messaging_preference.message_attribute_id | html %]"
207
                     id="digest[% messaging_preference.message_attribute_id | html %]"
208
                     value="[% messaging_preference.message_attribute_id | html %]"
208
                     value="[% messaging_preference.message_attribute_id | html %]"
209
                     name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
209
                     name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip"
210
                     [% IF ( !messaging_preference.has_digest_off ) %] disabled="disabled" title="Digest is mandatory"[% ELSE %] title="You must select a digestible transport to select digests"[% END %] />
210
              [% ELSE %]
211
              [% ELSE %]
211
                <input type="checkbox"
212
                <input type="checkbox"
212
                     id="digest[% messaging_preference.message_attribute_id | html %]"
213
                     id="digest[% messaging_preference.message_attribute_id | html %]"
213
                     value="[% messaging_preference.message_attribute_id | html %]"
214
                     value="[% messaging_preference.message_attribute_id | html %]"
214
                     name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
215
                     name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" data-toggle="tooltip"
216
                     [% IF ( !messaging_preference.has_digest_off ) %] checked="checked" disabled="disabled" title="Digest is mandatory"[% ELSE %] title="You must select a digestible transport to select digests"[% END %] />
217
              [% END %]
218
              [% IF ( !messaging_preference.has_digest_off ) # Because of disabled checkboxes are considered as false, use hidden input field to send true value %]
219
                <input
220
                     name="digest"
221
                     type="hidden"
222
                     id="forcedigest[% messaging_preference.message_attribute_id | html %]"
223
                     value="[% messaging_preference.message_attribute_id | html %]"
224
                />
215
              [% END %]
225
              [% END %]
216
          [% END %]
226
          [% END %]
217
      </td>
227
      </td>
(-)a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js (-2 / +6 lines)
Lines 57-65 $(document).ready(function(){ Link Here
57
    function toggle_digest(id){
57
    function toggle_digest(id){
58
        let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false;
58
        let phone_checked = TalkingTechItivaPhoneNotification ? false : PhoneNotification ? $("#phone"+id).prop("checked") : false;
59
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) {
59
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") || phone_checked ) {
60
            $("#digest"+id).attr("disabled", false).tooltip('disable');
60
            if ($("#forcedigest"+id).length === 0) {
61
                $("#digest"+id).attr("disabled", false).tooltip('disable');
62
            }
61
        } else {
63
        } else {
62
            $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable');
64
            if ($("#forcedigest"+id).length === 0) {
65
                $("#digest"+id).attr("disabled", true).prop("checked",false).tooltip('enable');
66
            }
63
        }
67
        }
64
68
65
    }
69
    }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-3 / +6 lines)
Lines 163-171 Link Here
163
                                            [% IF ( messaging_preference.has_digest ) %]
163
                                            [% IF ( messaging_preference.has_digest ) %]
164
                                                <td class="selectcol">
164
                                                <td class="selectcol">
165
                                                    [% IF ( messaging_preference.digest ) %]
165
                                                    [% IF ( messaging_preference.digest ) %]
166
                                                        <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" checked="checked" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
166
                                                        <input type="[% IF ( messaging_preference.has_digest_off ) %]checkbox[% ELSE %]hidden[% END %]" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" checked="checked" data-toggle="tooltip" [% IF ( !messaging_preference.has_digest_off ) %]title="This option cannot be changed" disabled[% ELSE %]title="You must select a digestible transport to select digests"[% END %] />
167
                                                    [% ELSE %]
167
                                                    [% ELSE %]
168
                                                        <input type="checkbox" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" data-toggle="tooltip" title="You must select a digestible transport to select digests" />
168
                                                        <input type="[% IF ( messaging_preference.has_digest_off ) %]checkbox[% ELSE %]hidden[% END %]" id="digest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]" name="digest" data-toggle="tooltip" [% IF ( !messaging_preference.has_digest_off ) %]title="This option cannot be changed" checked="checked" disabled[% ELSE %]title="You must select a digestible transport to select digests"[% END %] />
169
                                                    [% END %]
170
                                                    [% IF ( !messaging_preference.has_digest_off ) # Because of disabled checkboxes are considered as false, use hidden input field to send true value %]
171
                                                        <i class="fa fa-check-square" aria-hidden="true" title="This option cannot be changed" data-toggle="tooltip"></i>
172
                                                        <input name="digest" type="hidden" id="forcedigest[% messaging_preference.message_attribute_id | html %]" value="[% messaging_preference.message_attribute_id | html %]"/>
169
                                                    [% END %]
173
                                                    [% END %]
170
                                                </td>
174
                                                </td>
171
                                            [% ELSE %]
175
                                            [% ELSE %]
172
- 

Return to bug 18595