Bugzilla – Attachment 98326 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: Make sure we default to '*' if no rule exist
Bug-18936-Make-sure-we-default-to--if-no-rule-exis.patch (text/plain), 2.14 KB, created by
Jonathan Druart
on 2020-02-03 16:08:09 UTC
(
hide
)
Description:
Bug 18936: Make sure we default to '*' if no rule exist
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-02-03 16:08:09 UTC
Size:
2.14 KB
patch
obsolete
>From 4647189d4db5e21f2af5c147df5c0a546f39e5c8 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 23 Jan 2020 14:45:36 +0100 >Subject: [PATCH] Bug 18936: Make sure we default to '*' if no rule exist >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Making sure the code is doing what we expect. >Also this patch fix CirculationRules.t > >Signed-off-by: Minna Kivinen <minna.kivinen@hamk.fi> > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi> >--- > t/db_dependent/Koha/CirculationRules.t | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > >diff --git a/t/db_dependent/Koha/CirculationRules.t b/t/db_dependent/Koha/CirculationRules.t >index 2da56038d7..460868f671 100644 >--- a/t/db_dependent/Koha/CirculationRules.t >+++ b/t/db_dependent/Koha/CirculationRules.t >@@ -33,12 +33,13 @@ $schema->storage->txn_begin; > my $builder = t::lib::TestBuilder->new; > > subtest 'set_rule + get_effective_rule' => sub { >- plan tests => 13; >+ plan tests => 14; > > my $categorycode = $builder->build_object( { class => 'Koha::Patron::Categories' } )->categorycode; > my $itemtype = $builder->build_object( { class => 'Koha::ItemTypes' } )->itemtype; > my $branchcode = $builder->build_object( { class => 'Koha::Libraries' } )->branchcode; >- my $rule_name = 'my_rule'; >+ my $branchcode_2 = $builder->build_object( { class => 'Koha::Libraries' } )->branchcode; >+ my $rule_name = 'maxissueqty'; > my $default_rule_value = 1; > > my $rule; >@@ -109,6 +110,17 @@ subtest 'set_rule + get_effective_rule' => sub { > is( $rule->rule_value, 2, > 'More specific rule is returned when itemtype is given' ); > >+ $rule = Koha::CirculationRules->get_effective_rule( >+ { >+ branchcode => $branchcode_2, >+ categorycode => '*', >+ itemtype => '*', >+ rule_name => $rule_name, >+ } >+ ); >+ is( $rule->rule_value, 1, >+ 'Default rule is returned if there is no rule for this branchcode' ); >+ > Koha::CirculationRules->set_rule( > { > branchcode => '*', >-- >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