From 2d9aa59cc6a4e480bcbe7b69d3785774798d4dd4 Mon Sep 17 00:00:00 2001 From: loudej Date: Thu, 26 Nov 2009 05:47:48 +0000 Subject: [PATCH] Small fix to test setup, plus an obvious mistake using the wrong argument in Slice --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4042305 --- .../Users/Controllers/AdminControllerTests.cs | 1 + src/Orchard/Models/DefaultContentQuery.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs index 09729baee..78b7a528c 100644 --- a/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs +++ b/src/Orchard.Tests.Packages/Users/Controllers/AdminControllerTests.cs @@ -27,6 +27,7 @@ namespace Orchard.Tests.Packages.Users.Controllers { public override void Register(ContainerBuilder builder) { builder.Register(); builder.Register().As(); + builder.Register().As().FactoryScoped(); builder.Register().As(); builder.Register().As(); builder.Register(new Mock().Object); diff --git a/src/Orchard/Models/DefaultContentQuery.cs b/src/Orchard/Models/DefaultContentQuery.cs index 1e752d69e..be8cfa8ba 100644 --- a/src/Orchard/Models/DefaultContentQuery.cs +++ b/src/Orchard/Models/DefaultContentQuery.cs @@ -123,7 +123,7 @@ namespace Orchard.Models { if (skip != 0) criteria = criteria.SetFirstResult(skip); if (count != 0) - criteria = criteria.SetMaxResults(skip); + criteria = criteria.SetMaxResults(count); return criteria .List() .Select(x => ContentManager.Get(x.Id));