Merge branch 'hotfix/2021.1.5' into stable-2021.1

openequella · Feb 11, 2022 · 3873361 · 3873361
2 parents dad59c0 + c177e4a
commit 3873361
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/entity/PagedResults.scala b/Source/Plugins/Core/com.equella.core/scalasrc/com/tle/web/api/entity/PagedResults.scala
@@ -81,9 +81,14 @@ object PagedResults {
     }
 
     def getAvailable: Int = {
-      // It's acceptable to retrieve all because targeted BaseEntities are all small datasets.
-      val entities = getBaseEntities(0, -1)
-      filterByPermission(entities).length
+      // We only return the full number of available entities because filtering entities by ACL is very slow.
+      // Here is an example that would it.
+      // val entities = getBaseEntities(0, -1)
+      // filterByPermission(entities).length
+
+      res.getEntityService
+        .countAll(new EnumerateOptions(q, 0, -1, system, if (includeDisabled) null else false))
+        .toInt
     }
 
     def collectMore(length: Int, initialOffset: Int): (Int, List[PagedEntity[BE]]) = {

diff --git a/build.sbt b/build.sbt
@@ -116,7 +116,7 @@ name := "Equella"
 
 equellaMajor in ThisBuild := 2021
 equellaMinor in ThisBuild := 1
-equellaPatch in ThisBuild := 4
+equellaPatch in ThisBuild := 5
 equellaStream in ThisBuild := "Stable"
 equellaBuild in ThisBuild := buildConfig.value.getString("build.buildname")