Attachment 168883 Details for Bug 36641 – Bug 36641: Return '*' for 'default rule'

[patch] Bug 36641: Return '*' for 'default rule'

Bug-36641-Return--for-default-rule.patch (text/plain), 2.02 KB, created by Martin Renvoize (ashimema) on 2024-07-12 10:27:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-07-12 10:27:41 UTC

Size: 2.02 KB

patch

obsolete

>From b50485ee2baa835062159356820017979e1d4f2e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 12 Jul 2024 10:15:44 +0100
>Subject: [PATCH] Bug 36641: Return '*' for 'default rule'
>
>---
> Koha/REST/V1/CirculationRules.pm | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/Koha/REST/V1/CirculationRules.pm b/Koha/REST/V1/CirculationRules.pm
>index 05fe52c2999..81e5c93f1ce 100644
>--- a/Koha/REST/V1/CirculationRules.pm
>+++ b/Koha/REST/V1/CirculationRules.pm
>@@ -51,11 +51,11 @@ sub list_rules {
> 
>     return try {
>         my $effective       = $c->param('effective') // 1;
>-        my $kinds           = $c->param('rules') // [ keys %{ Koha::CirculationRules->rule_kinds } ];
>+        my $kinds           = $c->param('rules')     // [ keys %{ Koha::CirculationRules->rule_kinds } ];
>         my $item_type       = $c->param('item_type_id');
>         my $branchcode      = $c->param('library_id');
>         my $patron_category = $c->param('patron_category_id');
>-        my ($filter_branch, $filter_itemtype, $filter_patron);
>+        my ( $filter_branch, $filter_itemtype, $filter_patron );
> 
>         if ($item_type) {
>             $filter_itemtype = 1;
>@@ -124,8 +124,12 @@ sub list_rules {
>             ) // {};
>             push @{$rules}, $effective_rules;
>         } else {
>-            my $select = [ 'branchcode', 'categorycode', 'itemtype' ];
>-            my $as     = [ 'branchcode', 'categorycode', 'itemtype' ];
>+            my $select = [
>+                { 'COALESCE' => [ 'branchcode',   \["'*'"] ], -as => 'branchcode' },
>+                { 'COALESCE' => [ 'categorycode', \["'*'"] ], -as => 'categorycode' },
>+                { 'COALESCE' => [ 'itemtype',     \["'*'"] ], -as => 'itemtype' }
>+            ];
>+            my $as = [ 'branchcode', 'categorycode', 'itemtype' ];
>             for my $kind ( @{$kinds} ) {
>                 push @{$select}, { max => \[ "CASE WHEN rule_name = ? THEN rule_value END", $kind ], -as => $kind };
>                 push @{$as}, $kind;
>-- 
>2.45.2

Actions: View | Diff | Splinter Review

Attachments on bug 36641: 165086 | 167937 | 167938 | 167946 | 167947 | 168018 | 168019 | 168020 | 168023 | 168024 | 168025 | 168365 | 168366 | 168367 | 168368 | 168369 | 168370 | 168378 | 168379 | 168395 | 168396 | 168397 | 168398 | 168399 | 168400 | 168401 | 168841 | 168874 | 168875 | 168876 | 168877 | 168878 | 168879 | 168880 | 168881 | 168882 | 168883 | 168884 | 168905 | 168906 | 168907 | 168908 | 168909 | 168910 | 168911 | 168912 | 168913 | 168914 | 168915 | 168916 | 168926 | 168927 | 168928 | 168929 | 168930 | 168931 | 168932 | 168933 | 168934 | 168935 | 168936 | 168937 | 168938 | 168940 | 169013 | 169014 | 169015 | 169016 | 169017 | 169018 | 169019 | 169020 | 169021 | 169022 | 169023 | 169024 | 169025 | 169026