diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs index e610c73..8525674 100644 --- a/Build/CommonAssemblyInfo.cs +++ b/Build/CommonAssemblyInfo.cs @@ -15,6 +15,6 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.7.1")] -[assembly: AssemblyFileVersion("1.7.1")] +[assembly: AssemblyVersion("1.7.2")] +[assembly: AssemblyFileVersion("1.7.2")] //[assembly: AssemblyInformationalVersion("1.4.5-editlyalpha2")] diff --git a/Griddly.Mvc/GriddlyResult.cs b/Griddly.Mvc/GriddlyResult.cs index a43441a..b3b762b 100644 --- a/Griddly.Mvc/GriddlyResult.cs +++ b/Griddly.Mvc/GriddlyResult.cs @@ -37,7 +37,15 @@ public SortField[] GetSortFields(NameValueCollection items) }) .ToArray(); } - + + public abstract IEnumerable GetAllNonGeneric(SortField[] sortFields); + + public abstract IList GetPageNonGeneric(int pageNumber, int pageSize, SortField[] sortFields); + + public abstract void PopulateSummaryValuesNonGeneric(GriddlySettings settings); + + public abstract long GetCount(); + public abstract IEnumerable

GetAllForProperty

(string propertyName); } @@ -172,12 +180,25 @@ public override void ExecuteResult(ControllerContext context) public abstract void PopulateSummaryValues(GriddlySettings settings); - public abstract long GetCount(); - public override IEnumerable

GetAllForProperty

(string propertyName) { throw new NotImplementedException(); } + + public override IEnumerable GetAllNonGeneric(SortField[] sortFields) + { + return GetAll(sortFields); + } + + public override IList GetPageNonGeneric(int pageNumber, int pageSize, SortField[] sortFields) + { + return (IList)(GetPage(pageNumber, pageSize, sortFields).ToList()); + } + + public override void PopulateSummaryValuesNonGeneric(GriddlySettings settings) + { + PopulateSummaryValues((GriddlySettings)settings); + } } public enum GriddlyExportFormat