Bug 25601: (bug 18928 follow-up) Fix "Unset" for "return policy for $branch"
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 26 May 2020 08:10:52 +0000 (10:10 +0200)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 28 May 2020 15:02:13 +0000 (17:02 +0200)
returnbranch has to pass an itemtype key when setting the rule (here
setting it to unlimited for any item types)

Test plan:
1. Go the "Circulation and fine rules" admin page
2. Set a rule for "Default checkout, hold and return policy"
3. Unset it
4. Select a library
5. Set a rule for "Default checkout, hold and return policy"
6. Unset it

Display should be consistent with what you selected

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

admin/smart-rules.pl

index 6bea920..195ca81 100755 (executable)
@@ -161,6 +161,7 @@ elsif ($op eq 'delete-branch-cat') {
                 branchcode   => $branch,
                 categorycode => undef,
                 rules        => {
+                    max_holds                => undef,
                     patron_maxissueqty       => undef,
                     patron_maxonsiteissueqty => undef,
                 }
@@ -169,11 +170,11 @@ elsif ($op eq 'delete-branch-cat') {
         Koha::CirculationRules->set_rules(
             {
                 branchcode   => $branch,
+                itemtype     => undef,
                 rules        => {
                     holdallowed             => undef,
                     hold_fulfillment_policy => undef,
                     returnbranch            => undef,
-                    max_holds               => undef,
                 }
             }
         );