<%t SilverStripe\\CMS\\Controllers\\CMSMain.ListFiltered 'Showing search results.' %>
-
+
<%t SilverStripe\\CMS\\Controllers\\CMSMain.TreeFilteredClear 'Clear' %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
index 2f535786..787d5eb0 100644
--- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
+++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_PageList.ss
@@ -3,7 +3,12 @@
data-url="$LinkTreeViewDeferred"
data-url-treeview="$LinkTreeViewDeferred"
data-url-listview="$LinkListViewDeferred"
- data-url-listviewchildren="$LinkListViewChildren(0)"
+ data-url-listviewroot="$LinkListViewRoot"
+ data-no-ajax="<% if $TreeIsFiltered || $RequestViewState = 'listview'%>true<% else %>false<% end_if %>"
>
- <%-- Lazy-loaded via ajax --%>
+ <% if $TreeIsFiltered || $RequestViewState = 'listview' %>
+ <% include SilverStripe\\CMS\\Controllers\\CMSMain_ListView %>
+ <% else %>
+ <%-- Lazy-loaded via ajax --%>
+ <% end_if %>