Browse Source

Bug 7317: Add partner_code checks to abot page

This patch adds checks to the configured (or fallback) partner_code.
It produces two different warnings:

- Configured partner_code doesn't match an existing patron category
code.
- partner_code is not defined, a fallback to ILLLIBS is done

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
17.11.x
Tomás Cohen Arazi 7 years ago
committed by Jonathan Druart
parent
commit
4b79948400
  1. 20
      about.pl
  2. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

20
about.pl

@ -35,6 +35,7 @@ use C4::Installer;
use Koha;
use Koha::Acquisition::Currencies;
use Koha::Patron::Categories;
use Koha::Patrons;
use Koha::Caches;
use Koha::Config::SysPrefs;
@ -261,16 +262,33 @@ if ( !defined C4::Context->config('use_zebra_facets') ) {
}
}
# ILL module checks
if ( C4::Context->preference('ILLModule') ) {
my $warnILLConfiguration = 0;
my $ill_config_from_file = C4::Context->config("interlibrary_loans");
my $ill_config = Koha::Illrequest::Config->new;
my $available_ill_backends =
( scalar @{ Koha::Illrequest::Config->new->available_backends } > 0 );
( scalar @{ $ill_config->available_backends } > 0 );
# Check backends
if ( !$available_ill_backends ) {
$template->param( no_ill_backends => 1 );
$warnILLConfiguration = 1;
}
# Check partner_code
if ( !Koha::Patron::Categories->find($ill_config->partner_code) ) {
$template->param( ill_partner_code_doesnt_exist => $ill_config->partner_code );
$warnILLConfiguration = 1;
}
if ( !$ill_config_from_file->{partner_code} ) {
# partner code not defined
$template->param( ill_partner_code_not_defined => 1 );
$warnILLConfiguration = 1;
}
$template->param( warnILLConfiguration => $warnILLConfiguration );
}

14
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

@ -227,9 +227,21 @@
</td></tr>
[% END %]
[% IF warnILLConfiguration %]
[% IF no_ill_backends %]
<tr><th scope="row"><b>Warning</b> </th><td>
[% IF no_ill_backends %]The ILL module is enabled, but there are no backends available.[%END %]
The ILL module is enabled, but there are no backends available.
</td></tr>
[% END %]
[% IF ill_partner_code_not_defined %]
<tr><th scope="row"><b>Warning</b> </th><td>
The ILL module is enabled, but no 'partner_code' defined in koha-conf.xml. Falling back to the hardcoded 'ILLLIBS'.
</td></tr>
[%END %]
[% IF ill_partner_code_doesnt_exist %]
<tr><th scope="row"><b>Warning</b> </th><td>
The ILL module is enabled, but the configured 'partner_code' ([% ill_partner_code_doesnt_exist %]) is not defined on the system.
</td></tr>
[% END %]
[% END %]
</table>
[% END %]

Loading…
Cancel
Save