Bugzilla – Attachment 77086 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: (follow-up) Fix null/empty behavior
Bug-18887-follow-up-Fix-nullempty-behavior.patch (text/plain), 3.31 KB, created by
Kyle M Hall (khall)
on 2018-07-18 18:03:07 UTC
(
hide
)
Description:
Bug 18887: (follow-up) Fix null/empty behavior
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-07-18 18:03:07 UTC
Size:
3.31 KB
patch
obsolete
>From f46a286e04fadc724c5ebd68e2cbaf88d1d19df8 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 18 Jul 2018 17:35:46 +0000 >Subject: [PATCH] Bug 18887: (follow-up) Fix null/empty behavior > >--- > C4/Reserves.pm | 2 +- > admin/smart-rules.pl | 2 +- > installer/data/mysql/atomicupdate/bug_18887.perl | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 1796420f32..91585a9c16 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -427,7 +427,7 @@ sub CanItemBeReserved { > rule_name => 'max_holds', > } > ); >- if ( $rule ) { >+ if ( $rule && defined( $rule->rule_value ) && $rule->rule_value ne '' ) { > my $total_holds_count = Koha::Holds->search( > { > borrowernumber => $borrower->{borrowernumber} >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index 9f739c8cd0..24d4b39ee4 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -228,7 +228,7 @@ elsif ($op eq "set-branch-defaults") { > $holdallowed =~ s/\s//g; > $holdallowed = undef if $holdallowed !~ /^\d+/; > $max_holds =~ s/\s//g; >- $max_holds = undef if $max_holds !~ /^\d+/; >+ $max_holds = '' if $max_holds !~ /^\d+/; > > if ($branch eq "*") { > my $sth_search = $dbh->prepare("SELECT count(*) AS total >diff --git a/installer/data/mysql/atomicupdate/bug_18887.perl b/installer/data/mysql/atomicupdate/bug_18887.perl >index 38610c9d44..07ee2d357f 100644 >--- a/installer/data/mysql/atomicupdate/bug_18887.perl >+++ b/installer/data/mysql/atomicupdate/bug_18887.perl >@@ -20,12 +20,12 @@ if( CheckVersion( $DBversion ) ) { > > $dbh->do(q{ > INSERT INTO circulation_rules ( branchcode, categorycode, itemtype, rule_name, rule_value ) >- SELECT branchcode, categorycode, NULL, 'max_holds', max_holds FROM branch_borrower_circ_rules >+ SELECT branchcode, categorycode, NULL, 'max_holds', COALESCE( max_holds, '' ) FROM branch_borrower_circ_rules > }); > > $dbh->do(q{ > INSERT INTO circulation_rules ( branchcode, categorycode, itemtype, rule_name, rule_value ) >- SELECT NULL, categorycode, NULL, 'max_holds', max_holds FROM branch_borrower_circ_rules >+ SELECT NULL, categorycode, NULL, 'max_holds', COALESCE( max_holds, '' ) FROM default_borrower_circ_rules > }); > > $dbh->do(q{ >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 0993c5eddf..76046137c7 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 >@@ -519,7 +519,7 @@ > </td> > <td> > [% 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 %] >+ [% IF rule_value.defined && rule_value != '' %] > [% rule_value %] > [% ELSE %] > Unlimited >-- >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