From c9e28097018b71dd54ddd9c37cc4903105d30467 Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Fri, 7 Jan 2022 18:01:57 +0200
Subject: [PATCH] Remove paginator inheritance from AttrGetFilter struct

---
 apis/filter_indexes.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apis/filter_indexes.go b/apis/filter_indexes.go
index d28f8d794..7176ad679 100644
--- a/apis/filter_indexes.go
+++ b/apis/filter_indexes.go
@@ -36,7 +36,6 @@ type AttrGetFilterIndexes struct {
 	FilterField string
 	FilterValue string
 	APIOpts     map[string]interface{}
-	utils.Paginator
 }
 
 type AttrRemFilterIndexes struct {
@@ -219,12 +218,12 @@ func (adms *AdminSv1) GetFilterIndexes(ctx *context.Context, arg *AttrGetFilterI
 			}
 		}
 	}
-	if arg.Paginator.Limit != nil || arg.Paginator.Offset != nil {
-		*reply = arg.Paginator.PaginateStringSlice(indexedSlice)
-	} else {
-		*reply = indexedSlice
+	var limit, offset, maxItems int
+	if limit, offset, maxItems, err = utils.GetPaginateOpts(arg.APIOpts); err != nil {
+		return
 	}
-	return nil
+	*reply, err = utils.Paginate(indexedSlice, limit, offset, maxItems)
+	return
 }
 
 // ComputeFilterIndexes selects which index filters to recompute