gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 18936: Fix warning about page about wrong lengthunit 

Signed-off-by: Minna Kivinen <minna.kivinen@hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Jonathan Druart 2020-01-22 14:14:41 +01:00 committed by Martin Renvoize
parent e19c25fbad
commit 4ec3fe042d
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
about.pl
View File

@ -456,12 +456,9 @@ $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs;
# Circ rule warnings
{
my $dbh = C4::Context->dbh;
my $units = $dbh->selectall_arrayref(
q|SELECT branchcode, categorycode, itemtype, lengthunit FROM issuingrules WHERE lengthunit NOT IN ( 'days', 'hours' ); |,
{ Slice => {} }
);
my $units = Koha::CirculationRules->search({ rule_name => 'lengthunit', rule_value => { -not_in => ['days', 'hours'] } });
if (@$units) {
if ( $units->count ) {
$template->param(
warnIssuingRules => 1,
ir_units => $units,

6
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View File

@ -412,9 +412,9 @@
[% FOREACH unit IN ir_units %]
<tr>
<th scope="row"><b>Warning</b></th>
<td>The [% unit.branchcode | html %], [% unit.categorycode | html %], [% unit.itemtype | html %]
issuingrule will fallback to 'days' for 'lengthunit' as it is incorrectly defined as
[% unit.lengthunit | html %].
<td>The [% unit.branchcode || 'branchcode=default' | html %], [% unit.categorycode || 'categorycode=default' | html %], [% unit.itemtype || 'itemtype=default' | html %]
issuingrule will fallback to 'days' for 'lengthunit' as it is incorrectly defined as
[% unit.rule_value | html %].
</td>
</tr>
[% END %]