Merge pull request #561 from plone/fix-batch-doing-search-twice

Avoid doing the search twice in listings by reusing the batch variable
plone · Jul 8, 2020 · 3a7ea8c · 3a7ea8c
2 parents afd2d69 + 0feaa8a
commit 3a7ea8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/news/560.bugfix b/news/560.bugfix
@@ -0,0 +1,2 @@
+Avoid doing the search twice in listings by reusing the batch variable.
+[vincentfretin]
diff --git a/plone/app/contenttypes/browser/templates/listing.pt b/plone/app/contenttypes/browser/templates/listing.pt
@@ -129,7 +129,7 @@
 
       <metal:empty metal:define-slot="no_items_in_listing">
         <p class="discreet"
-            tal:condition="not: view/batch"
+            tal:condition="not: batch"
             tal:content="view/no_items_message">
           There are currently no items in this folder.
         </p>

diff --git a/plone/app/contenttypes/browser/templates/listing_tabular.pt b/plone/app/contenttypes/browser/templates/listing_tabular.pt
@@ -105,7 +105,7 @@
 
     <metal:empty metal:define-slot="no_items_in_listing">
     <p class="discreet"
-    tal:condition="not: view/batch"
+    tal:condition="not: batch"
     tal:content="view/no_items_message">
     There are currently no items in this folder.
     </p>