From 1ef8c02d1957a02e751b21cae7d2e19ee9e3d5b7 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 11 Apr 2023 15:35:28 +0200 Subject: [PATCH] [v9.5.x] Library panels: Ensure pagination controls are always correctly displayed (#66279) Library panels: Ensure pagination controls are always correctly displayed (#65283) correctly count library panels in the general folder (cherry picked from commit fda38de293f595be9bf6d1d821fecd9dcbb74082) Co-authored-by: Ashley Harrison --- pkg/services/libraryelements/database.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go index 15fe4406a33..519c8f4d037 100644 --- a/pkg/services/libraryelements/database.go +++ b/pkg/services/libraryelements/database.go @@ -409,8 +409,19 @@ func (l *LibraryElementService) getAllLibraryElements(c context.Context, signedI var libraryElements []model.LibraryElement countBuilder := db.SQLBuilder{} - countBuilder.Write("SELECT * FROM library_element AS le") - countBuilder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id") + if folderFilter.includeGeneralFolder { + countBuilder.Write(selectLibraryElementDTOWithMeta) + countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect())) + countBuilder.Write(` WHERE le.org_id=? AND le.folder_id=0`, signedInUser.OrgID) + writeKindSQL(query, &countBuilder) + writeSearchStringSQL(query, l.SQLStore, &countBuilder) + writeExcludeSQL(query, &countBuilder) + writeTypeFilterSQL(typeFilter, &countBuilder) + countBuilder.Write(" UNION ") + } + countBuilder.Write(selectLibraryElementDTOWithMeta) + countBuilder.Write(getFromLibraryElementDTOWithMeta(l.SQLStore.GetDialect())) + countBuilder.Write(" INNER JOIN dashboard AS dashboard on le.folder_id = dashboard.id and le.folder_id<>0") countBuilder.Write(` WHERE le.org_id=?`, signedInUser.OrgID) writeKindSQL(query, &countBuilder) writeSearchStringSQL(query, l.SQLStore, &countBuilder)