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

(-)a/admin/identity_providers.pl (-6 / +10 lines)
Lines 63-71 if ( !$domain_ops && $op eq 'cud-add' ) { Link Here
63
    my $protocol    = $input->param('protocol');
63
    my $protocol    = $input->param('protocol');
64
64
65
    # Domain configuration params
65
    # Domain configuration params
66
    my $allow_opac          = $input->param('allow_opac')    // 0;
66
    my $allow_opac          = $input->param('allow_opac')          // 0;
67
    my $allow_staff         = $input->param('allow_staff')   // 0;
67
    my $allow_staff         = $input->param('allow_staff')         // 0;
68
    my $auto_register       = $input->param('auto_register') // 0;
68
    my $auto_register_opac  = $input->param('auto_register_opac')  // 0;
69
    my $auto_register_staff = $input->param('auto_register_staff') // 0;
69
    my $default_category_id = $input->param('default_category_id');
70
    my $default_category_id = $input->param('default_category_id');
70
    my $default_library_id  = $input->param('default_library_id');
71
    my $default_library_id  = $input->param('default_library_id');
71
    my $domain              = $input->param('domain');
72
    my $domain              = $input->param('domain');
Lines 91-97 if ( !$domain_ops && $op eq 'cud-add' ) { Link Here
91
                        identity_provider_id => $provider->identity_provider_id,
92
                        identity_provider_id => $provider->identity_provider_id,
92
                        allow_opac           => $allow_opac,
93
                        allow_opac           => $allow_opac,
93
                        allow_staff          => $allow_staff,
94
                        allow_staff          => $allow_staff,
94
                        auto_register        => $auto_register,
95
                        auto_register_opac   => $auto_register_opac,
96
                        auto_register_staff  => $auto_register_staff,
95
                        default_category_id  => $default_category_id,
97
                        default_category_id  => $default_category_id,
96
                        default_library_id   => $default_library_id,
98
                        default_library_id   => $default_library_id,
97
                        domain               => $domain,
99
                        domain               => $domain,
Lines 120-126 if ( !$domain_ops && $op eq 'cud-add' ) { Link Here
120
    my $allow_opac           = $input->param('allow_opac');
122
    my $allow_opac           = $input->param('allow_opac');
121
    my $allow_staff          = $input->param('allow_staff');
123
    my $allow_staff          = $input->param('allow_staff');
122
    my $identity_provider_id = $input->param('identity_provider_id');
124
    my $identity_provider_id = $input->param('identity_provider_id');
123
    my $auto_register        = $input->param('auto_register');
125
    my $auto_register_opac   = $input->param('auto_register_opac');
126
    my $auto_register_staff  = $input->param('auto_register_staff');
124
    my $default_category_id  = $input->param('default_category_id') || undef;
127
    my $default_category_id  = $input->param('default_category_id') || undef;
125
    my $default_library_id   = $input->param('default_library_id')  || undef;
128
    my $default_library_id   = $input->param('default_library_id')  || undef;
126
    my $domain               = $input->param('domain');
129
    my $domain               = $input->param('domain');
Lines 133-139 if ( !$domain_ops && $op eq 'cud-add' ) { Link Here
133
                allow_opac           => $allow_opac,
136
                allow_opac           => $allow_opac,
134
                allow_staff          => $allow_staff,
137
                allow_staff          => $allow_staff,
135
                identity_provider_id => $identity_provider_id,
138
                identity_provider_id => $identity_provider_id,
136
                auto_register        => $auto_register,
139
                auto_register_opac   => $auto_register_opac,
140
                auto_register_staff  => $auto_register_staff,
137
                default_category_id  => $default_category_id,
141
                default_category_id  => $default_category_id,
138
                default_library_id   => $default_library_id,
142
                default_library_id   => $default_library_id,
139
                domain               => $domain,
143
                domain               => $domain,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/identity_provider_domains.tt (-27 / +63 lines)
Lines 116-127 Link Here
116
                        <span>user data on login</span>
116
                        <span>user data on login</span>
117
                    </li>
117
                    </li>
118
                    <li>
118
                    <li>
119
                        <label for="auto_register">Auto register: </label>
119
                        <label for="auto_register_opac">Auto register (OPAC): </label>
120
                        <select name="auto_register" id="auto_register">
120
                        <select name="auto_register_opac" id="auto_register_opac">
121
                            <option value="1">Allow</option>
121
                            <option value="1">Allow</option>
122
                            <option value="0" selected="selected">Don't allow</option>
122
                            <option value="0" selected="selected">Don't allow</option>
123
                        </select>
123
                        </select>
124
                        <span>users to auto register on login</span>
124
                        <span>users to auto register on login (OPAC)</span>
125
                    </li>
126
                    <li>
127
                        <label for="auto_register_staff">Auto register (Staff interface): </label>
128
                        <select name="auto_register_staff" id="auto_register_staff">
129
                            <option value="1">Allow</option>
130
                            <option value="0" selected="selected">Don't allow</option>
131
                        </select>
132
                        <span>users to auto register on login (Staff interface)</span>
125
                    </li>
133
                    </li>
126
                    <li>
134
                    <li>
127
                        <label for="default_library_id">Default library: </label>
135
                        <label for="default_library_id">Default library: </label>
Lines 205-213 Link Here
205
                        <span>user data on login</span>
213
                        <span>user data on login</span>
206
                    </li>
214
                    </li>
207
                    <li>
215
                    <li>
208
                        <label for="auto_register">Auto register: </label>
216
                        <label for="auto_register_opac">Auto register (OPAC): </label>
209
                        <select name="auto_register" id="auto_register">
217
                        <select name="auto_register_opac" id="auto_register_opac">
210
                            [% IF identity_provider_domain.auto_register == "1" %]
218
                            [% IF identity_provider_domain.auto_register_opac == "1" %]
219
                                <option value="1" selected="selected">Allow</option>
220
                                <option value="0">Don't allow</option>
221
                            [% ELSE %]
222
                                <option value="1">Allow</option>
223
                                <option value="0" selected="selected">Don't allow</option>
224
                            [% END %]
225
                        </select>
226
                        <span>users to auto register on OPAC login</span>
227
                    </li>
228
                    <li>
229
                        <label for="auto_register_staff">Auto register (Staff): </label>
230
                        <select name="auto_register_staff" id="auto_register_staff">
231
                            [% IF identity_provider_domain.auto_register_staff == "1" %]
211
                                <option value="1" selected="selected">Allow</option>
232
                                <option value="1" selected="selected">Allow</option>
212
                                <option value="0">Don't allow</option>
233
                                <option value="0">Don't allow</option>
213
                            [% ELSE %]
234
                            [% ELSE %]
Lines 215-221 Link Here
215
                                <option value="0" selected="selected">Don't allow</option>
236
                                <option value="0" selected="selected">Don't allow</option>
216
                            [% END %]
237
                            [% END %]
217
                        </select>
238
                        </select>
218
                        <span>users to auto register on login</span>
239
                        <span>users to auto register on staff interface login</span>
219
                    </li>
240
                    </li>
220
                    <li>
241
                    <li>
221
                        <label for="default_library_id">Default library: </label>
242
                        <label for="default_library_id">Default library: </label>
Lines 301-324 Link Here
301
        </div>
322
        </div>
302
    [% END %]
323
    [% END %]
303
324
304
    <div id="delete_confirm_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="delete_confirm_modal_label" aria-hidden="true">
325
    <div id="toolbar" class="btn-toolbar">
305
        <div class="modal-dialog">
326
        <a class="btn btn-default" id="new_identity_provider_domain" href="/cgi-bin/koha/admin/identity_providers.pl?domain_ops=1&amp;identity_provider_id=[%- identity_provider_id | html -%]&amp;op=add_form"
306
            <div class="modal-content">
327
            ><i class="fa fa-plus"></i> New identity provider domain</a
307
                <div class="modal-header">
328
        >
308
                    <h1 class="modal-title" id="delete_confirm_modal_label">Confirm deletion of identity provider domain</h1>
329
    </div>
309
                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
330
310
                </div>
331
    <h1>[% tx("Identity provider domains for '{identity_provider_code}'", {identity_provider_code = identity_provider_code}) | html %]</h1>
311
                <div class="modal-body">
332
    <div class="page-section">
312
                    <div id="delete_confirm_dialog"></div>
333
        <table id="identity_provider_domains">
313
                </div>
334
            <thead>
314
                <div class="modal-footer">
335
                <tr>
315
                    <a href="#" class="btn btn-danger" id="delete_confirm_modal_button" role="button" data-bs-toggle="modal">Delete</a>
336
                    <th>Domain</th>
316
                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
337
                    <th>Update on login</th>
317
                </div>
338
                    <th>Auto register (OPAC)</th>
318
            </div>
339
                    <th>Auto register (Staff)</th>
319
            <!-- /.modal-content -->
340
                    <th>Default library</th>
320
        </div>
341
                    <th>Default category</th>
321
        <!-- /.modal-dialog -->
342
                    <th>Allow OPAC</th>
343
                    <th>Allow staff</th>
344
                    <th data-class-name="actions noExport">Actions</th>
345
                </tr>
346
            </thead>
347
        </table>
322
    </div>
348
    </div>
323
    <!-- #delete_confirm_modal -->
349
    <!-- #delete_confirm_modal -->
324
[% END %]
350
[% END %]
Lines 390-396 Link Here
390
                    },
416
                    },
391
                    {
417
                    {
392
                        "data": function( row, type, val, meta ) {
418
                        "data": function( row, type, val, meta ) {
393
                            if (row.auto_register) {
419
                            if (row.auto_register_opac) {
420
                                return _("Yes");
421
                            } else {
422
                                return _("No");
423
                            }
424
                        },
425
                        "searchable": true,
426
                        "orderable": true
427
                    },
428
                    {
429
                        "data": function( row, type, val, meta ) {
430
                            if (row.auto_register_staff) {
394
                                return _("Yes");
431
                                return _("Yes");
395
                            } else {
432
                            } else {
396
                                return _("No");
433
                                return _("No");
397
- 

Return to bug 37711