From 1254a11b8da860c9d2cb85a0d70810b2bec60d9a Mon Sep 17 00:00:00 2001
From: Thierry Fleury <thierry@codinlab.fr>
Date: Thu, 17 Nov 2016 21:47:15 +0100
Subject: [PATCH] Sort Taxonomies Terms failed

Fixes #6795
---
 .../Orchard.Taxonomies/Controllers/TermAdminController.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
index 5e434b1d1..9b12af703 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs
@@ -42,11 +42,13 @@ namespace Orchard.Taxonomies.Controllers {
 
             var taxonomy = _taxonomyService.GetTaxonomy(taxonomyId);
 
-            var terms = TermPart.Sort(_taxonomyService.GetTermsQuery(taxonomyId).Slice(pager.GetStartIndex(), pager.PageSize));
+            var allTerms = TermPart.Sort(_taxonomyService.GetTermsQuery(taxonomyId).List());
 
-            var pagerShape = Shape.Pager(pager).TotalItemCount(_taxonomyService.GetTermsQuery(taxonomyId).Count());
+            var termsPage = pager.PageSize > 0 ? allTerms.Skip(pager.GetStartIndex()).Take(pager.PageSize) : allTerms;
 
-            var entries = terms
+            var pagerShape = Shape.Pager(pager).TotalItemCount(allTerms.Count());
+
+            var entries = termsPage
                     .Select(term => term.CreateTermEntry())
                     .ToList();