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

(-)a/Koha/Illrequest/Config.pm (-2 / +2 lines)
Lines 255-261 sub _load_configuration { Link Here
255
        limits             => {},
255
        limits             => {},
256
        digital_recipients => {},
256
        digital_recipients => {},
257
        prefixes           => {},
257
        prefixes           => {},
258
        partner_code       => 'ILLLIBS',
258
        partner_code       => 'IL',
259
        raw_config         => $xml_config,
259
        raw_config         => $xml_config,
260
    };
260
    };
261
261
Lines 319-325 sub _load_configuration { Link Here
319
        if ( $reply_date && 'hide' eq $reply_date );
319
        if ( $reply_date && 'hide' eq $reply_date );
320
320
321
    # ILL Partners
321
    # ILL Partners
322
    $configuration->{partner_code} = $xml_config->{partner_code} || 'ILLLIBS';
322
    $configuration->{partner_code} = $xml_config->{partner_code} || 'IL';
323
323
324
    return $configuration;
324
    return $configuration;
325
}
325
}
(-)a/debian/templates/koha-conf-site.xml.in (-2 / +2 lines)
Lines 390-397 __END_SRU_PUBLICSERVER__ Link Here
390
          - branch: send the ILL to the branch email -->
390
          - branch: send the ILL to the branch email -->
391
     <digital_recipient>branch</digital_recipient>
391
     <digital_recipient>branch</digital_recipient>
392
     <!-- What patron category should we use for p2p ILL requests?
392
     <!-- What patron category should we use for p2p ILL requests?
393
          - By default this is set to 'ILLLIBS' -->
393
          - By default this is set to 'IL' -->
394
     <partner_code>ILLLIBS</partner_code>
394
     <partner_code>IL</partner_code>
395
 </interlibrary_loans>
395
 </interlibrary_loans>
396
396
397
 <!-- The timezone setting can let you force the timezone for this
397
 <!-- The timezone setting can let you force the timezone for this
(-)a/etc/koha-conf.xml (-2 / +2 lines)
Lines 207-214 Link Here
207
          - branch: send the ILL to the branch email -->
207
          - branch: send the ILL to the branch email -->
208
     <digital_recipient>branch</digital_recipient>
208
     <digital_recipient>branch</digital_recipient>
209
     <!-- What patron category should we use for p2p ILL requests?
209
     <!-- What patron category should we use for p2p ILL requests?
210
          - By default this is set to 'ILLLIBS' -->
210
          - By default this is set to 'IL' -->
211
     <partner_code>ILLLIBS</partner_code>
211
     <partner_code>IL</partner_code>
212
 </interlibrary_loans>
212
 </interlibrary_loans>
213
213
214
 <!-- The timezone setting can let you force the timezone for this
214
 <!-- The timezone setting can let you force the timezone for this
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +1 lines)
Lines 503-509 Link Here
503
                                            <tr>
503
                                            <tr>
504
                                                <th scope="row"><strong>Warning</strong> </th>
504
                                                <th scope="row"><strong>Warning</strong> </th>
505
                                                <td>
505
                                                <td>
506
                                                    The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'ILLLIBS'.
506
                                                    The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'IL'.
507
                                                </td>
507
                                                </td>
508
                                            </tr>
508
                                            </tr>
509
                                        [% END %]
509
                                        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt (-1 / +1 lines)
Lines 383-389 Link Here
383
                    [% ELSE %]
383
                    [% ELSE %]
384
                        <fieldset class="rows">
384
                        <fieldset class="rows">
385
                            <legend>Interlibrary loan request details</legend>
385
                            <legend>Interlibrary loan request details</legend>
386
                            <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
386
                            <p>No partners have been defined yet. Please create appropriate patron records (by default IL category).</p>
387
                            <p>Be sure to provide email addresses for these patrons.</p>
387
                            <p>Be sure to provide email addresses for these patrons.</p>
388
                            <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p>
388
                            <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p>
389
                        </fieldset>
389
                        </fieldset>
(-)a/t/Koha/Config.t (-1 / +1 lines)
Lines 214-220 subtest 'read_from_file() tests' => sub { Link Here
214
                'staff_request_comments' => 'hide',
214
                'staff_request_comments' => 'hide',
215
                'reply_date' => 'hide',
215
                'reply_date' => 'hide',
216
                'digital_recipient' => 'branch',
216
                'digital_recipient' => 'branch',
217
                'partner_code' => 'ILLLIBS',
217
                'partner_code' => 'IL',
218
            },
218
            },
219
            'timezone' => '',
219
            'timezone' => '',
220
            'bcrypt_settings' => '__BCRYPT_SETTINGS__',
220
            'bcrypt_settings' => '__BCRYPT_SETTINGS__',
(-)a/t/data/koha-conf.xml (-2 / +2 lines)
Lines 207-214 Link Here
207
          - branch: send the ILL to the branch email -->
207
          - branch: send the ILL to the branch email -->
208
     <digital_recipient>branch</digital_recipient>
208
     <digital_recipient>branch</digital_recipient>
209
     <!-- What patron category should we use for p2p ILL requests?
209
     <!-- What patron category should we use for p2p ILL requests?
210
          - By default this is set to 'ILLLIBS' -->
210
          - By default this is set to 'IL' -->
211
     <partner_code>ILLLIBS</partner_code>
211
     <partner_code>IL</partner_code>
212
 </interlibrary_loans>
212
 </interlibrary_loans>
213
213
214
 <!-- The timezone setting can let you force the timezone for this
214
 <!-- The timezone setting can let you force the timezone for this
(-)a/t/db_dependent/Illrequest/Config.t (-12 / +11 lines)
Lines 60-68 subtest 'Basics' => sub { Link Here
60
    is($config->backend_dir, "/tmp/", "backend_dir: setter is persistent.");
60
    is($config->backend_dir, "/tmp/", "backend_dir: setter is persistent.");
61
61
62
    # partner_code:
62
    # partner_code:
63
    is($config->partner_code, "ILLLIBS", "partner_code: Undefined partner_code is undefined.");
63
    is($config->partner_code, "IL", "partner_code: Undefined partner_code is undefined.");
64
    is($config->partner_code("ILLLIBSTST"), "ILLLIBSTST", "partner_code: setter works.");
64
    is($config->partner_code("ILTST"), "ILTST", "partner_code: setter works.");
65
    is($config->partner_code, "ILLLIBSTST", "partner_code: setter is persistent.");
65
    is($config->partner_code, "ILTST", "partner_code: setter is persistent.");
66
66
67
    # limits:
67
    # limits:
68
    is_deeply($config->limits, {}, "limits: Undefined limits is empty hash.");
68
    is_deeply($config->limits, {}, "limits: Undefined limits is empty hash.");
Lines 211-217 subtest '_load_configuration' => sub { Link Here
211
            limits             => {},
211
            limits             => {},
212
            digital_recipients => {},
212
            digital_recipients => {},
213
            prefixes           => {},
213
            prefixes           => {},
214
            partner_code       => 'ILLLIBS',
214
            partner_code       => 'IL',
215
            raw_config         => {},
215
            raw_config         => {},
216
        },
216
        },
217
        "load_configuration: return the base configuration."
217
        "load_configuration: return the base configuration."
Lines 229-235 subtest '_load_configuration' => sub { Link Here
229
            limits             => {},
229
            limits             => {},
230
            digital_recipients => {},
230
            digital_recipients => {},
231
            prefixes           => {},
231
            prefixes           => {},
232
            partner_code       => 'ILLLIBS',
232
            partner_code       => 'IL',
233
            raw_config         => { backend_directory => '/tmp/' },
233
            raw_config         => { backend_directory => '/tmp/' },
234
        },
234
        },
235
        "load_configuration: return the correct backend_dir."
235
        "load_configuration: return the correct backend_dir."
Lines 255-261 subtest '_load_configuration' => sub { Link Here
255
            limits             => { branch => { 1 => { method => 'annual', count => 1 } } },
255
            limits             => { branch => { 1 => { method => 'annual', count => 1 } } },
256
            digital_recipients => { branch => { 3 => 'branch' } },
256
            digital_recipients => { branch => { 3 => 'branch' } },
257
            prefixes           => { branch => { 2 => '2-prefix' } },
257
            prefixes           => { branch => { 2 => '2-prefix' } },
258
            partner_code       => 'ILLLIBS',
258
            partner_code       => 'IL',
259
            raw_config         => $xml_config,
259
            raw_config         => $xml_config,
260
        },
260
        },
261
        "load_configuration: multi branch config parsed correctly."
261
        "load_configuration: multi branch config parsed correctly."
Lines 281-287 subtest '_load_configuration' => sub { Link Here
281
            limits             => { branch => { 1 => { method => 'annual', count => 1 } } },
281
            limits             => { branch => { 1 => { method => 'annual', count => 1 } } },
282
            digital_recipients => { branch => { 1 => 'branch' } },
282
            digital_recipients => { branch => { 1 => 'branch' } },
283
            prefixes           => { branch => { 1 => '2-prefix' } },
283
            prefixes           => { branch => { 1 => '2-prefix' } },
284
            partner_code       => 'ILLLIBS',
284
            partner_code       => 'IL',
285
            raw_config         => $xml_config,
285
            raw_config         => $xml_config,
286
        },
286
        },
287
        "load_configuration: single branch config parsed correctly."
287
        "load_configuration: single branch config parsed correctly."
Lines 307-313 subtest '_load_configuration' => sub { Link Here
307
            limits             => { brw_cat => { A => { method => 'annual', count => 1 } } },
307
            limits             => { brw_cat => { A => { method => 'annual', count => 1 } } },
308
            digital_recipients => { brw_cat => { C => 'branch' } },
308
            digital_recipients => { brw_cat => { C => 'branch' } },
309
            prefixes           => { brw_cat => { B => '2-prefix' } },
309
            prefixes           => { brw_cat => { B => '2-prefix' } },
310
            partner_code       => 'ILLLIBS',
310
            partner_code       => 'IL',
311
            raw_config         => $xml_config,
311
            raw_config         => $xml_config,
312
        },
312
        },
313
        "load_configuration: multi borrower_category config parsed correctly."
313
        "load_configuration: multi borrower_category config parsed correctly."
Lines 333-339 subtest '_load_configuration' => sub { Link Here
333
            limits             => { brw_cat => { 1 => { method => 'annual', count => 1 } } },
333
            limits             => { brw_cat => { 1 => { method => 'annual', count => 1 } } },
334
            digital_recipients => { brw_cat => { 1 => 'branch' } },
334
            digital_recipients => { brw_cat => { 1 => 'branch' } },
335
            prefixes           => { brw_cat => { 1 => '2-prefix' } },
335
            prefixes           => { brw_cat => { 1 => '2-prefix' } },
336
            partner_code       => 'ILLLIBS',
336
            partner_code       => 'IL',
337
            raw_config         => $xml_config,
337
            raw_config         => $xml_config,
338
        },
338
        },
339
        "load_configuration: single borrower_category config parsed correctly."
339
        "load_configuration: single borrower_category config parsed correctly."
Lines 357-363 subtest '_load_configuration' => sub { Link Here
357
            limits             => { default => { method => 'annual', count => 1 } },
357
            limits             => { default => { method => 'annual', count => 1 } },
358
            digital_recipients => { default => 'branch' },
358
            digital_recipients => { default => 'branch' },
359
            prefixes           => { default => '2-prefix' },
359
            prefixes           => { default => '2-prefix' },
360
            partner_code       => 'ILLLIBS',
360
            partner_code       => 'IL',
361
            raw_config         => $xml_config,
361
            raw_config         => $xml_config,
362
        },
362
        },
363
        "load_configuration: parse the default configuration."
363
        "load_configuration: parse the default configuration."
Lines 380-386 subtest '_load_configuration' => sub { Link Here
380
            limits             => {},
380
            limits             => {},
381
            digital_recipients => {},
381
            digital_recipients => {},
382
            prefixes           => {},
382
            prefixes           => {},
383
            partner_code       => 'ILLLIBS',
383
            partner_code       => 'IL',
384
            raw_config         => $xml_config,
384
            raw_config         => $xml_config,
385
        },
385
        },
386
        "load_configuration: parse censorship settings configuration."
386
        "load_configuration: parse censorship settings configuration."
387
- 

Return to bug 21548