Merge branch 'hotfix/2021.2.3'

openequella · Feb 11, 2022 · bfbe639 · bfbe639
2 parents cbbf3bd + aaaa68b
commit bfbe639
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -194,7 +194,7 @@ jobs:
   functional_testing:
     needs: build_and_check
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:

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
@@ -115,7 +115,7 @@ name := "Equella"
 
 (ThisBuild / equellaMajor) := 2021
 (ThisBuild / equellaMinor) := 2
-(ThisBuild / equellaPatch) := 2
+(ThisBuild / equellaPatch) := 3
 (ThisBuild / equellaStream) := "Stable"
 (ThisBuild / equellaBuild) := buildConfig.value.getString("build.buildname")
 (ThisBuild / buildTimestamp) := Instant.now().getEpochSecond