Bugzilla – Attachment 77087 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: Fix issues caused by rebase
Bug-18887-Fix-issues-caused-by-rebase.patch (text/plain), 2.28 KB, created by
Kyle M Hall (khall)
on 2018-07-18 18:03:11 UTC
(
hide
)
Description:
Bug 18887: Fix issues caused by rebase
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-07-18 18:03:11 UTC
Size:
2.28 KB
patch
obsolete
>From 1bc0440edc4f556f8d5f9fecb88bf3635a6ea0f8 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 18 Jul 2018 13:55:19 -0400 >Subject: [PATCH] Bug 18887: Fix issues caused by rebase > >--- > admin/smart-rules.pl | 5 ++--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- > 2 files changed, 3 insertions(+), 4 deletions(-) > >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index 24d4b39ee4..8207f26634 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -325,14 +325,13 @@ elsif ($op eq "add-branch-cat") { > WHERE categorycode = ?"); > my $sth_insert = $dbh->prepare(q| > INSERT INTO default_borrower_circ_rules >- (categorycode, maxissueqty, maxonsiteissueqty, max_holds) >- VALUES (?, ?, ?, ?) >+ (categorycode, maxissueqty, maxonsiteissueqty) >+ VALUES ( ?, ?, ?) > |); > my $sth_update = $dbh->prepare(q| > UPDATE default_borrower_circ_rules > SET maxissueqty = ?, > maxonsiteissueqty = ?, >- max_holds = ? > WHERE categorycode = ? > |); > $sth_search->execute($categorycode); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index 76046137c7..bd2ed426dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -518,7 +518,7 @@ > [% END %] > </td> > <td> >- [% SET rule_value = CirculationRules.Get( branch_cat_rule_loo.branchcode, branch_cat_rule_loo.categorycode, branch_cat_rule_loo.itemtype, 'max_holds' ) %] >+ [% SET rule_value = CirculationRules.Get( branch_cat_rule_loo.branchcode || '*', branch_cat_rule_loo.categorycode, branch_cat_rule_loo.itemtype, 'max_holds' ) %] > [% IF rule_value.defined && rule_value != '' %] > [% rule_value %] > [% ELSE %] >-- >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 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