Bugzilla – Attachment 98322 Details for
Bug 18936
Move issuingrules into circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18936: Fix warning about page about wrong lengthunit
Bug-18936-Fix-warning-about-page-about-wrong-lengt.patch (text/plain), 2.45 KB, created by
Jonathan Druart
on 2020-02-03 16:07:48 UTC
(
hide
)
Description:
Bug 18936: Fix warning about page about wrong lengthunit
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-02-03 16:07:48 UTC
Size:
2.45 KB
patch
obsolete
>From d320be4a05f67b7b4db05ffb2b10715e7d0700f2 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 22 Jan 2020 14:14:41 +0100 >Subject: [PATCH] Bug 18936: Fix warning about page about wrong lengthunit >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Minna Kivinen <minna.kivinen@hamk.fi> > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> >--- > about.pl | 7 ++----- > koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 6 +++--- > 2 files changed, 5 insertions(+), 8 deletions(-) > >diff --git a/about.pl b/about.pl >index 18293b5db4..42fe42f170 100755 >--- a/about.pl >+++ b/about.pl >@@ -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, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >index 1c94254b6c..1540b5630d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt >@@ -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 %] >-- >2.11.0
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 18936
:
65247
|
65248
|
65249
|
67629
|
67758
|
68236
|
71034
|
71035
|
71036
|
71037
|
71038
|
71039
|
71040
|
71041
|
72230
|
72231
|
72232
|
72233
|
72234
|
72235
|
72236
|
72237
|
72238
|
91953
|
91954
|
91955
|
91956
|
91957
|
91958
|
91959
|
91960
|
91961
|
91962
|
91963
|
91964
|
91965
|
91966
|
91967
|
91968
|
91969
|
91970
|
91971
|
91972
|
91973
|
91974
|
91975
|
94179
|
94180
|
94181
|
94182
|
94183
|
94184
|
94185
|
94186
|
94187
|
94188
|
94189
|
94190
|
94191
|
94192
|
94193
|
94194
|
94195
|
94196
|
94197
|
94198
|
94199
|
94200
|
98299
|
98300
|
98301
|
98302
|
98303
|
98304
|
98305
|
98306
|
98307
|
98308
|
98309
|
98310
|
98311
|
98312
|
98313
|
98314
|
98315
|
98316
|
98317
|
98318
|
98319
|
98320
|
98321
| 98322 |
98323
|
98324
|
98325
|
98326
|
98327
|
98328
|
98329
|
98330
|
98331
|
98332
|
98333
|
98334
|
98335
|
98336
|
98337
|
98338
|
98339
|
98340
|
98341
|
98342
|
98343
|
98344
|
98345
|
98346
|
98347
|
98407
|
98408