From e361d205673138540f003bd3fa516f61a8f60287 Mon Sep 17 00:00:00 2001
From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
Date: Fri, 5 Jul 2024 12:10:16 +0000
Subject: [PATCH] Bug 37262: Fix for unmapped tablename filtering

---
 Koha/REST/V1/ExtendedAttributeTypes.pm             | 8 +++++++-
 api/v1/swagger/paths/extended_attribute_types.yaml | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Koha/REST/V1/ExtendedAttributeTypes.pm b/Koha/REST/V1/ExtendedAttributeTypes.pm
index 1cc402d704..f8855872b2 100644
--- a/Koha/REST/V1/ExtendedAttributeTypes.pm
+++ b/Koha/REST/V1/ExtendedAttributeTypes.pm
@@ -53,9 +53,15 @@ sub list {
 
     return try {
         my $additional_fields_set = Koha::AdditionalFields->new;
-        if ($resource_type) {
+        if ($resource_type && $resource_to_table->{$resource_type}) {
             $additional_fields_set =
                 $additional_fields_set->search( { tablename => $resource_to_table->{$resource_type} } );
+        } elsif ($resource_type) {
+            $additional_fields_set =
+                $additional_fields_set->search( { tablename => $resource_type } );
+        }else{
+            $additional_fields_set =
+              $additional_fields_set->search();
         }
 
         return $c->render(
diff --git a/api/v1/swagger/paths/extended_attribute_types.yaml b/api/v1/swagger/paths/extended_attribute_types.yaml
index f96049f1ed..f49d54b91e 100644
--- a/api/v1/swagger/paths/extended_attribute_types.yaml
+++ b/api/v1/swagger/paths/extended_attribute_types.yaml
@@ -17,6 +17,9 @@
           - basket
           - invoice
           - order
+          - subscription
+          - accountlines:credit
+          - accountlines:debit
       - $ref: "../swagger.yaml#/parameters/match"
       - $ref: "../swagger.yaml#/parameters/order_by"
       - $ref: "../swagger.yaml#/parameters/page"
-- 
2.39.2