Bugzilla – Attachment 79778 Details for
Bug 18887
Introduce new table 'circulation_rules', use for 'max_holds' rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18887: (QA follow-up) Remove last occurences of old max_holds
Bug-18887-QA-follow-up-Remove-last-occurences-of-o.patch (text/plain), 2.76 KB, created by
Josef Moravec
on 2018-10-01 19:37:01 UTC
(
hide
)
Description:
Bug 18887: (QA follow-up) Remove last occurences of old max_holds
Filename:
MIME Type:
Creator:
Josef Moravec
Created:
2018-10-01 19:37:01 UTC
Size:
2.76 KB
patch
obsolete
>From f6356d7bff048bd1c7f426534acd243c496ebc22 Mon Sep 17 00:00:00 2001 >From: Josef Moravec <josef.moravec@gmail.com> >Date: Mon, 1 Oct 2018 19:14:41 +0000 >Subject: [PATCH] Bug 18887: (QA follow-up) Remove last occurences of old > max_holds > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >--- > admin/smart-rules.pl | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index bdeee64..d7161ff 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -292,18 +292,18 @@ elsif ($op eq "add-branch-cat") { > > if ($branch eq "*") { > if ($categorycode eq "*") { >+ #FIXME This block is will probably be never used > my $sth_search = $dbh->prepare("SELECT count(*) AS total > FROM default_circ_rules"); > my $sth_insert = $dbh->prepare(q| > INSERT INTO default_circ_rules >- (maxissueqty, maxonsiteissueqty, max_holds) >- VALUES (?, ?, ?) >+ (maxissueqty, maxonsiteissueqty) >+ VALUES (?, ?) > |); > my $sth_update = $dbh->prepare(q| > UPDATE default_circ_rules > SET maxissueqty = ?, > maxonsiteissueqty = ?, >- max_holds = ? > |); > > $sth_search->execute(); >@@ -385,14 +385,13 @@ elsif ($op eq "add-branch-cat") { > AND categorycode = ?"); > my $sth_insert = $dbh->prepare(q| > INSERT INTO branch_borrower_circ_rules >- (branchcode, categorycode, maxissueqty, maxonsiteissueqty, max_holds) >- VALUES (?, ?, ?, ?, ?) >+ (branchcode, categorycode, maxissueqty, maxonsiteissueqty) >+ VALUES (?, ?, ?, ?) > |); > my $sth_update = $dbh->prepare(q| > UPDATE branch_borrower_circ_rules > SET maxissueqty = ?, > maxonsiteissueqty = ? >- max_holds = ? > WHERE branchcode = ? > AND categorycode = ? > |); >@@ -400,9 +399,9 @@ elsif ($op eq "add-branch-cat") { > $sth_search->execute($branch, $categorycode); > my $res = $sth_search->fetchrow_hashref(); > if ($res->{total}) { >- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $max_holds, $branch, $categorycode); >+ $sth_update->execute($maxissueqty, $maxonsiteissueqty, $branch, $categorycode); > } else { >- $sth_insert->execute($branch, $categorycode, $maxissueqty, $maxonsiteissueqty, $max_holds); >+ $sth_insert->execute($branch, $categorycode, $maxissueqty, $maxonsiteissueqty); > } > > Koha::CirculationRules->set_rule( >-- >2.1.4
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 18887
:
65233
|
65234
|
65235
|
65236
|
65237
|
67620
|
70986
|
70987
|
70988
|
70989
|
70990
|
70991
|
71031
|
71042
|
72218
|
72219
|
72220
|
72221
|
72222
|
72223
|
72224
|
77080
|
77081
|
77082
|
77083
|
77084
|
77085
|
77086
|
77087
|
77207
|
77208
|
77209
|
77210
|
77211
|
77212
|
77213
|
77214
|
77215
|
77218
|
77238
|
77649
|
77650
|
77651
|
77652
|
77653
|
77654
|
77655
|
77656
|
77657
|
77658
|
77659
|
78346
|
78347
|
78348
|
78349
|
78350
|
78351
|
78352
|
78353
|
78354
|
78355
|
78356
|
78674
|
78675
|
78676
|
78677
|
78678
|
78679
|
78680
|
78681
|
78682
|
78683
|
78684
|
78743
|
78744
|
78745
|
78746
|
78747
|
78748
|
78749
|
78750
|
78751
|
78752
|
78753
|
78879
|
79119
|
79626
|
79627
|
79628
|
79629
|
79630
|
79631
|
79632
|
79633
|
79634
|
79635
|
79636
|
79637
|
79638
|
79639
|
79640
|
79641
|
79761
|
79762
|
79763
|
79764
|
79765
|
79766
|
79767
|
79768
|
79769
|
79770
|
79771
|
79772
|
79773
|
79774
|
79775
|
79776
| 79778 |
79891