#23195 include in 23.10.24

dotCMS · Mar 25, 2024 · 264995d · 264995d
1 parent 2056dcc
commit 264995d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -83,4 +83,5 @@ This maintenance release includes the following code fixes:
 76. https://github.com/dotCMS/core/issues/27775 : Page API Returning Content Related to Page Asset #27775
 77. https://github.com/dotCMS/core/issues/27187 : remove unneeded DB hit from edit content screen #27187
 78. https://github.com/dotCMS/core/issues/27384 : Update local.dotcms.site SSL cert for 2024 #27384
-79. https://github.com/dotCMS/core/issues/26004 : Image field doesn't export as a header in CSV #26004
+79. https://github.com/dotCMS/core/issues/26004 : Image field doesn't export as a header in CSV #26004
+80. https://github.com/dotCMS/core/issues/23195 : Site Browser: Slow loading folder with many items #23195
diff --git a/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java b/dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
@@ -8354,10 +8354,10 @@ private void validateRelationships(final Contentlet contentlet,
                             // In order to get the related content we should use method getRelatedContent
                             // that has -boolean pullByParent- as parameter so we can pass -false-
                             // to get related content where we are parents.
-                            final List<Contentlet> relatedContents = getRelatedContentFromIndex(
+                            final List<Contentlet> relatedContents = getRelatedContent(
                                     contentInRelationship, relationship, false,
                                     APILocator.getUserAPI()
-                                            .getSystemUser(), true);
+                                            .getSystemUser(), true, 1, 0, null);
                             // If there's a 1-N relationship and the parent
                             // content is relating to a child that already has
                             // a parent...
@@ -8390,7 +8390,7 @@ private void validateRelationships(final Contentlet contentlet,
                                 cve.addInvalidContentRelationship(relationship,
                                         contentsInRelationship);
                             }
-                        } catch (final DotSecurityException | DotDataException e) {
+                        } catch (final DotDataException e) {
                             Logger.error(this,
                                     "An error occurred when retrieving information from related Contentlet"
                                             +
@@ -8484,7 +8484,7 @@ private boolean isValidOneToOneRelationship(final Contentlet contentlet,
             List<Contentlet> relatedContents = getRelatedContent(
                     contentsInRelationship.get(0), relationship, null,
                     APILocator.getUserAPI()
-                            .getSystemUser(), true);
+                            .getSystemUser(), true, 1, 0, null);
             if (relatedContents.size() > 0 && !relatedContents.get(0).getIdentifier()
                     .equals(contentlet.getIdentifier())) {
                 Logger.error(this,
@@ -8496,7 +8496,7 @@ private boolean isValidOneToOneRelationship(final Contentlet contentlet,
                 cve.addBadCardinalityRelationship(relationship, contentsInRelationship);
                 return false;
             }
-        } catch (final DotSecurityException | DotDataException e) {
+        } catch (final DotDataException e) {
             Logger.error(this,
                     "An error occurred when retrieving information from related Contentlet" +
                             " [" + contentsInRelationship.get(0).getIdentifier() + "]", e);