Bugzilla – Attachment 147416 Details for
Bug 21548
Make ILL patron category in koha-conf.xml match with ILL patron category in sample data
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21548: ILLLIBS patron category / partner_code seems extraneous
Bug-21548-ILLLIBS-patron-category--partnercode-see.patch (text/plain), 11.09 KB, created by
Katrin Fischer
on 2023-02-26 10:45:27 UTC
(
hide
)
Description:
Bug 21548: ILLLIBS patron category / partner_code seems extraneous
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-02-26 10:45:27 UTC
Size:
11.09 KB
patch
obsolete
>From 887ab911139aa1f37688c5e7391bf66344f2e65a Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Tue, 7 Feb 2023 14:48:02 +0000 >Subject: [PATCH] Bug 21548: ILLLIBS patron category / partner_code seems > extraneous > >This patch updates the default partner category used by the partner_code config to be in line with sample data in sample_patrons.yml > >Preparation: >Apply patch >Enable ILLModule sys pref >Install an ILL backend (e.g. FreeForm) >Add this change to your koha-conf.xml >Flush, restart. >Search for patron of category inter-library loan and assign a primary e-mail address to it > >Test plan: >Create an ILL request and click 'place request with partners' >Verify that the 'select partner libraries' has the correct patron of IL category > >Run tests and ensure they pass: >prove t/db_dependent/Illrequest/Config.t >prove t/Koha/Config.t > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > Koha/Illrequest/Config.pm | 4 ++-- > debian/templates/koha-conf-site.xml.in | 4 ++-- > etc/koha-conf.xml | 4 ++-- > .../intranet-tmpl/prog/en/modules/about.tt | 2 +- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > t/Koha/Config.t | 2 +- > t/data/koha-conf.xml | 4 ++-- > t/db_dependent/Illrequest/Config.t | 22 +++++++++---------- > 8 files changed, 22 insertions(+), 22 deletions(-) > >diff --git a/Koha/Illrequest/Config.pm b/Koha/Illrequest/Config.pm >index 82b77685ac..02dac2ca65 100644 >--- a/Koha/Illrequest/Config.pm >+++ b/Koha/Illrequest/Config.pm >@@ -255,7 +255,7 @@ sub _load_configuration { > limits => {}, > digital_recipients => {}, > prefixes => {}, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }; > >@@ -319,7 +319,7 @@ sub _load_configuration { > if ( $reply_date && 'hide' eq $reply_date ); > > # ILL Partners >- $configuration->{partner_code} = $xml_config->{partner_code} || 'ILLLIBS'; >+ $configuration->{partner_code} = $xml_config->{partner_code} || 'IL'; > > return $configuration; > } >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index bdb994c517..cb2ab09bd2 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -390,8 +390,8 @@ __END_SRU_PUBLICSERVER__ > - branch: send the ILL to the branch email --> > <digital_recipient>branch</digital_recipient> > <!-- What patron category should we use for p2p ILL requests? >- - By default this is set to 'ILLLIBS' --> >- <partner_code>ILLLIBS</partner_code> >+ - By default this is set to 'IL' --> >+ <partner_code>IL</partner_code> > </interlibrary_loans> > > <!-- The timezone setting can let you force the timezone for this >diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml >index 3e5623cb96..e7ccdc62b9 100644 >--- a/etc/koha-conf.xml >+++ b/etc/koha-conf.xml >@@ -207,8 +207,8 @@ > - branch: send the ILL to the branch email --> > <digital_recipient>branch</digital_recipient> > <!-- What patron category should we use for p2p ILL requests? >- - By default this is set to 'ILLLIBS' --> >- <partner_code>ILLLIBS</partner_code> >+ - By default this is set to 'IL' --> >+ <partner_code>IL</partner_code> > </interlibrary_loans> > > <!-- The timezone setting can let you force the timezone for this >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index dd45dae2c6..570539836a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -503,7 +503,7 @@ > <tr> > <th scope="row"><strong>Warning</strong> </th> > <td> >- The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'ILLLIBS'. >+ The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'IL'. > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index baf9d47ae4..81b64eaa06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -383,7 +383,7 @@ > [% ELSE %] > <fieldset class="rows"> > <legend>Interlibrary loan request details</legend> >- <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p> >+ <p>No partners have been defined yet. Please create appropriate patron records (by default IL category).</p> > <p>Be sure to provide email addresses for these patrons.</p> > <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p> > </fieldset> >diff --git a/t/Koha/Config.t b/t/Koha/Config.t >index dbee1529be..b49579c1f7 100755 >--- a/t/Koha/Config.t >+++ b/t/Koha/Config.t >@@ -214,7 +214,7 @@ subtest 'read_from_file() tests' => sub { > 'staff_request_comments' => 'hide', > 'reply_date' => 'hide', > 'digital_recipient' => 'branch', >- 'partner_code' => 'ILLLIBS', >+ 'partner_code' => 'IL', > }, > 'timezone' => '', > 'bcrypt_settings' => '__BCRYPT_SETTINGS__', >diff --git a/t/data/koha-conf.xml b/t/data/koha-conf.xml >index 5a5d5c3ba0..01052920b3 100644 >--- a/t/data/koha-conf.xml >+++ b/t/data/koha-conf.xml >@@ -207,8 +207,8 @@ > - branch: send the ILL to the branch email --> > <digital_recipient>branch</digital_recipient> > <!-- What patron category should we use for p2p ILL requests? >- - By default this is set to 'ILLLIBS' --> >- <partner_code>ILLLIBS</partner_code> >+ - By default this is set to 'IL' --> >+ <partner_code>IL</partner_code> > </interlibrary_loans> > > <!-- The timezone setting can let you force the timezone for this >diff --git a/t/db_dependent/Illrequest/Config.t b/t/db_dependent/Illrequest/Config.t >index b80babdc8a..8baa624234 100755 >--- a/t/db_dependent/Illrequest/Config.t >+++ b/t/db_dependent/Illrequest/Config.t >@@ -60,9 +60,9 @@ subtest 'Basics' => sub { > is($config->backend_dir, "/tmp/", "backend_dir: setter is persistent."); > > # partner_code: >- is($config->partner_code, "ILLLIBS", "partner_code: Undefined partner_code is undefined."); >- is($config->partner_code("ILLLIBSTST"), "ILLLIBSTST", "partner_code: setter works."); >- is($config->partner_code, "ILLLIBSTST", "partner_code: setter is persistent."); >+ is($config->partner_code, "IL", "partner_code: Undefined partner_code is undefined."); >+ is($config->partner_code("ILTST"), "ILTST", "partner_code: setter works."); >+ is($config->partner_code, "ILTST", "partner_code: setter is persistent."); > > # limits: > is_deeply($config->limits, {}, "limits: Undefined limits is empty hash."); >@@ -211,7 +211,7 @@ subtest '_load_configuration' => sub { > limits => {}, > digital_recipients => {}, > prefixes => {}, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => {}, > }, > "load_configuration: return the base configuration." >@@ -229,7 +229,7 @@ subtest '_load_configuration' => sub { > limits => {}, > digital_recipients => {}, > prefixes => {}, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => { backend_directory => '/tmp/' }, > }, > "load_configuration: return the correct backend_dir." >@@ -255,7 +255,7 @@ subtest '_load_configuration' => sub { > limits => { branch => { 1 => { method => 'annual', count => 1 } } }, > digital_recipients => { branch => { 3 => 'branch' } }, > prefixes => { branch => { 2 => '2-prefix' } }, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: multi branch config parsed correctly." >@@ -281,7 +281,7 @@ subtest '_load_configuration' => sub { > limits => { branch => { 1 => { method => 'annual', count => 1 } } }, > digital_recipients => { branch => { 1 => 'branch' } }, > prefixes => { branch => { 1 => '2-prefix' } }, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: single branch config parsed correctly." >@@ -307,7 +307,7 @@ subtest '_load_configuration' => sub { > limits => { brw_cat => { A => { method => 'annual', count => 1 } } }, > digital_recipients => { brw_cat => { C => 'branch' } }, > prefixes => { brw_cat => { B => '2-prefix' } }, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: multi borrower_category config parsed correctly." >@@ -333,7 +333,7 @@ subtest '_load_configuration' => sub { > limits => { brw_cat => { 1 => { method => 'annual', count => 1 } } }, > digital_recipients => { brw_cat => { 1 => 'branch' } }, > prefixes => { brw_cat => { 1 => '2-prefix' } }, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: single borrower_category config parsed correctly." >@@ -357,7 +357,7 @@ subtest '_load_configuration' => sub { > limits => { default => { method => 'annual', count => 1 } }, > digital_recipients => { default => 'branch' }, > prefixes => { default => '2-prefix' }, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: parse the default configuration." >@@ -380,7 +380,7 @@ subtest '_load_configuration' => sub { > limits => {}, > digital_recipients => {}, > prefixes => {}, >- partner_code => 'ILLLIBS', >+ partner_code => 'IL', > raw_config => $xml_config, > }, > "load_configuration: parse censorship settings configuration." >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21548
:
146333
|
147416
|
148977
|
148978