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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-12 / +12 lines)
Lines 56-79 Link Here
56
                 <input type="checkbox"
56
                 <input type="checkbox"
57
                 id="sms[% messaging_preference.message_attribute_id | html %]"
57
                 id="sms[% messaging_preference.message_attribute_id | html %]"
58
                 name="[% messaging_preference.message_attribute_id | html %]"
58
                 name="[% messaging_preference.message_attribute_id | html %]"
59
                 value="sms" class="sms" checked="checked" disabled="disabled" />
59
                 value="pmp_sms" class="pmp_sms" checked="checked" disabled="disabled" />
60
              [% ELSE %]
60
              [% ELSE %]
61
                 <input type="checkbox"
61
                 <input type="checkbox"
62
                 id="sms[% messaging_preference.message_attribute_id | html %]"
62
                 id="sms[% messaging_preference.message_attribute_id | html %]"
63
                 name="[% messaging_preference.message_attribute_id | html %]"
63
                 name="[% messaging_preference.message_attribute_id | html %]"
64
                 value="sms" class="sms" disabled="disabled" />
64
                 value="pmp_sms" class="pmp_sms" disabled="disabled" />
65
              [% END %]
65
              [% END %]
66
          [% ELSE %]
66
          [% ELSE %]
67
              [% IF ( messaging_preference.transports_sms ) %]
67
              [% IF ( messaging_preference.transports_sms ) %]
68
                 <input type="checkbox"
68
                 <input type="checkbox"
69
                 id="sms[% messaging_preference.message_attribute_id | html %]"
69
                 id="sms[% messaging_preference.message_attribute_id | html %]"
70
                 name="[% messaging_preference.message_attribute_id | html %]"
70
                 name="[% messaging_preference.message_attribute_id | html %]"
71
                 value="sms" checked="checked" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
71
                 value="pmp_sms" checked="checked" class="pmp_sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
72
              [% ELSE %]
72
              [% ELSE %]
73
                 <input type="checkbox"
73
                 <input type="checkbox"
74
                 id="sms[% messaging_preference.message_attribute_id | html %]"
74
                 id="sms[% messaging_preference.message_attribute_id | html %]"
75
                 name="[% messaging_preference.message_attribute_id | html %]"
75
                 name="[% messaging_preference.message_attribute_id | html %]"
76
                 value="sms" class="sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
76
                 value="pmp_sms" class="pmp_sms active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
77
              [% END %]
77
              [% END %]
78
          [% END %]
78
          [% END %]
79
          </td>
79
          </td>
Lines 155-178 Link Here
155
                <input type="checkbox"
155
                <input type="checkbox"
156
                   id="email[% messaging_preference.message_attribute_id | html %]"
156
                   id="email[% messaging_preference.message_attribute_id | html %]"
157
                   name="[% messaging_preference.message_attribute_id | html %]"
157
                   name="[% messaging_preference.message_attribute_id | html %]"
158
                   value="email" class="email" checked="checked" disabled="disabled" />
158
                   value="email" class="pmp_email" checked="checked" disabled="disabled" />
159
              [% ELSE %]
159
              [% ELSE %]
160
                <input type="checkbox"
160
                <input type="checkbox"
161
                   id="email[% messaging_preference.message_attribute_id | html %]"
161
                   id="email[% messaging_preference.message_attribute_id | html %]"
162
                   name="[% messaging_preference.message_attribute_id | html %]"
162
                   name="[% messaging_preference.message_attribute_id | html %]"
163
                   value="email" class="email" disabled="disabled" />
163
                   value="email" class="pmp_email" disabled="disabled" />
164
              [% END %]
164
              [% END %]
165
          [% ELSE %]
165
          [% ELSE %]
166
              [% IF ( messaging_preference.transports_email ) %]
166
              [% IF ( messaging_preference.transports_email ) %]
167
            <input type="checkbox"
167
            <input type="checkbox"
168
                 id="email[% messaging_preference.message_attribute_id | html %]"
168
                 id="email[% messaging_preference.message_attribute_id | html %]"
169
                 name="[% messaging_preference.message_attribute_id | html %]"
169
                 name="[% messaging_preference.message_attribute_id | html %]"
170
                 value="email" checked="checked" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
170
                 value="pmp_email" checked="checked" class="pmp_email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
171
              [% ELSE %]
171
              [% ELSE %]
172
            <input type="checkbox"
172
            <input type="checkbox"
173
                 id="email[% messaging_preference.message_attribute_id | html %]"
173
                 id="email[% messaging_preference.message_attribute_id | html %]"
174
                 name="[% messaging_preference.message_attribute_id | html %]"
174
                 name="[% messaging_preference.message_attribute_id | html %]"
175
                 value="email" class="email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
175
                 value="pmp_email" class="pmp_email active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
176
              [% END %]
176
              [% END %]
177
          [% END %]
177
          [% END %]
178
      </td>
178
      </td>
Lines 187-210 Link Here
187
                <input type="checkbox"
187
                <input type="checkbox"
188
                     id="digest[% messaging_preference.message_attribute_id | html %]"
188
                     id="digest[% messaging_preference.message_attribute_id | html %]"
189
                     value="[% messaging_preference.message_attribute_id | html %]"
189
                     value="[% messaging_preference.message_attribute_id | html %]"
190
                     name="digest" class="digest" checked="checked" disabled="disabled" />
190
                     name="digest" class="pmp_digest" checked="checked" disabled="disabled" />
191
              [% ELSE %]
191
              [% ELSE %]
192
                <input type="checkbox"
192
                <input type="checkbox"
193
                     id="digest[% messaging_preference.message_attribute_id | html %]"
193
                     id="digest[% messaging_preference.message_attribute_id | html %]"
194
                     value="[% messaging_preference.message_attribute_id | html %]"
194
                     value="[% messaging_preference.message_attribute_id | html %]"
195
                     name="digest" class="digest" disabled="disabled" />
195
                     name="digest" class="pmp_digest" disabled="disabled" />
196
              [% END %]
196
              [% END %]
197
          [% ELSE %]
197
          [% ELSE %]
198
              [% IF ( messaging_preference.digest ) %]
198
              [% IF ( messaging_preference.digest ) %]
199
                <input type="checkbox"
199
                <input type="checkbox"
200
                     id="digest[% messaging_preference.message_attribute_id | html %]"
200
                     id="digest[% messaging_preference.message_attribute_id | html %]"
201
                     value="[% messaging_preference.message_attribute_id | html %]"
201
                     value="[% messaging_preference.message_attribute_id | html %]"
202
                     name="digest" checked="checked" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
202
                     name="digest" checked="checked" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
203
              [% ELSE %]
203
              [% ELSE %]
204
                <input type="checkbox"
204
                <input type="checkbox"
205
                     id="digest[% messaging_preference.message_attribute_id | html %]"
205
                     id="digest[% messaging_preference.message_attribute_id | html %]"
206
                     value="[% messaging_preference.message_attribute_id | html %]"
206
                     value="[% messaging_preference.message_attribute_id | html %]"
207
                     name="digest" class="digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
207
                     name="digest" class="pmp_digest active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
208
              [% END %]
208
              [% END %]
209
          [% END %]
209
          [% END %]
210
      </td>
210
      </td>
(-)a/koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js (-4 / +4 lines)
Lines 49-55 $(document).ready(function(){ Link Here
49
    }
49
    }
50
50
51
    // At load time, we want digest disabled if no digest using transport is enabled
51
    // At load time, we want digest disabled if no digest using transport is enabled
52
    $("#memberentry_messaging_prefs .email").each(function(){
52
    $(".pmp_email").each(function(){
53
        var rowid = $(this).attr("id");
53
        var rowid = $(this).attr("id");
54
        id = Number(rowid.replace("email",""));
54
        id = Number(rowid.replace("email",""));
55
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
55
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
Lines 60-75 $(document).ready(function(){ Link Here
60
    });
60
    });
61
61
62
    // If user clears all digest using transports for a notice, disable digest checkbox
62
    // If user clears all digest using transports for a notice, disable digest checkbox
63
    $(".email").click(function(){
63
    $(".pmp_email").click(function(){
64
        var rowid = $(this).attr("id");
64
        var rowid = $(this).attr("id");
65
        id = Number(rowid.replace("email",""));
65
        id = Number(rowid.replace("email",""));
66
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
66
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
67
            $("#digest"+id).attr("disabled", false);
67
            $("#digest"+id).attr("disabled", false);
68
        } else {
68
        } else {
69
            $("#digest"+id).attr("disabled", true);
69
            $("#digest"+id).attr("disabled", true).prop("checked",false);
70
        }
70
        }
71
    });
71
    });
72
    $(".sms").click(function(){
72
    $(".pmp_sms").click(function(){
73
        var rowid = $(this).attr("id");
73
        var rowid = $(this).attr("id");
74
        id = Number(rowid.replace("sms",""));
74
        id = Number(rowid.replace("sms",""));
75
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
75
        if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-8 / +7 lines)
Lines 89-97 Link Here
89
                                                [% IF ( messaging_preference.transport_sms ) %]
89
                                                [% IF ( messaging_preference.transport_sms ) %]
90
                                                    <td class="selectcol">
90
                                                    <td class="selectcol">
91
                                                        [% IF ( messaging_preference.transports_sms ) %]
91
                                                        [% IF ( messaging_preference.transports_sms ) %]
92
                                                        <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
92
                                                        <input type="checkbox" class="pmp_sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
93
                                                        [% ELSE %]
93
                                                        [% ELSE %]
94
                                                            <input type="checkbox" class="sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
94
                                                            <input type="checkbox" class="pmp_sms" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
95
                                                        [% END %]
95
                                                        [% END %]
96
                                                    </td>
96
                                                    </td>
97
                                                [% ELSE %]
97
                                                [% ELSE %]
Lines 144-152 Link Here
144
                                            [% IF ( messaging_preference.transport_email ) %]
144
                                            [% IF ( messaging_preference.transport_email ) %]
145
                                                <td class="selectcol">
145
                                                <td class="selectcol">
146
                                                    [% IF ( messaging_preference.transports_email ) %]
146
                                                    [% IF ( messaging_preference.transports_email ) %]
147
                                                        <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" />
147
                                                        <input type="checkbox" class="pmp_email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" />
148
                                                    [% ELSE %]
148
                                                    [% ELSE %]
149
                                                        <input type="checkbox" class="email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" />
149
                                                        <input type="checkbox" class="pmp_email" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" />
150
                                                    [% END %]
150
                                                    [% END %]
151
                                                </td>
151
                                                </td>
152
                                            [% ELSE %]
152
                                            [% ELSE %]
Lines 251-257 Link Here
251
            $("#info_digests").tooltip();
251
            $("#info_digests").tooltip();
252
252
253
            // At load time, we want digest disabled if no digest using transport is enabled
253
            // At load time, we want digest disabled if no digest using transport is enabled
254
            $(".email").each(function(){
254
            $(".pmp_email").each(function(){
255
                var rowid = $(this).attr("id");
255
                var rowid = $(this).attr("id");
256
                id = Number(rowid.replace("email",""));
256
                id = Number(rowid.replace("email",""));
257
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
257
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
Lines 262-268 Link Here
262
            });
262
            });
263
263
264
            // If user clears all digest using transports for a notice, disable digest checkbox
264
            // If user clears all digest using transports for a notice, disable digest checkbox
265
            $(".email").click(function(){
265
            $(".pmp_email").click(function(){
266
                var rowid = $(this).attr("id");
266
                var rowid = $(this).attr("id");
267
                id = Number(rowid.replace("email",""));
267
                id = Number(rowid.replace("email",""));
268
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
268
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
Lines 271-277 Link Here
271
                    $("#digest"+id).attr("disabled", true).prop("checked",false);
271
                    $("#digest"+id).attr("disabled", true).prop("checked",false);
272
                }
272
                }
273
            });
273
            });
274
            $(".sms").click(function(){
274
            $(".pmp_sms").click(function(){
275
                var rowid = $(this).attr("id");
275
                var rowid = $(this).attr("id");
276
                id = Number(rowid.replace("sms",""));
276
                id = Number(rowid.replace("sms",""));
277
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
277
                if ( $("#email"+id).prop("checked") || $("#sms"+id).prop("checked") ) {
278
- 

Return to bug 13613