ModelBindingFix

Author: mcintyre321

Mvc.JQuery.DataTables.AspNetCore.Example/Controllers/HomeController.cs

@@ -4,6 +4,7 @@
 using Mvc.JQuery.DataTables.Models;
 using Mvc.JQuery.DataTables.Serialization;
 using System.Linq;
+using System.Reflection;
 
 namespace Mvc.JQuery.DataTables.Example.Controllers
 {
@@ -109,5 +110,10 @@ public DataTablesResult<UserTableRowViewModel> GetUsers([FromForm] DataTablesPar
                 });
         }
 
+        public ContentResult EmbeddedResource()
+        {
+            var assembly = typeof(DataTableConfigVm).GetTypeInfo().Assembly;
+            return Content(string.Join("|", assembly.GetManifestResourceNames().Select(r => r)));
+        }
     }
 }

Mvc.JQuery.DataTables.AspNetCore/DataTablesModelBinder.cs

@@ -16,11 +16,15 @@ public Task BindModelAsync(ModelBindingContext bindingContext)
             //TODO: Consider whether this should be pushed to a worker thread...
             if (columns == 0)
             {
-                return Task.FromResult(BindV10Model(valueProvider));
+                var bindV10Model = BindV10Model(valueProvider);
+                bindingContext.Result = ModelBindingResult.Success(bindV10Model);
+                return Task.FromResult(bindV10Model);
             }
             else
             {
-                return Task.FromResult(BindLegacyModel(valueProvider, columns));
+                var bindLegacyModel = BindLegacyModel(valueProvider, columns);
+                bindingContext.Result = ModelBindingResult.Success(bindLegacyModel);
+                return Task.FromResult(bindLegacyModel);
             }
         }
 
@@ -110,7 +114,7 @@ public IModelBinder GetBinder(ModelBinderProviderContext context)
                 throw new ArgumentNullException(nameof(context));
             }
 
-            if (!context.Metadata.IsComplexType && context.Metadata.ModelType == typeof(string)) // only encode string types
+            if (context.Metadata.ModelType == typeof(DataTablesParam)) // only encode string types
             {
                 return new DataTablesModelBinder();
             }

Mvc.JQuery.DataTables.AspNetCore/Extensions.cs

@@ -49,12 +49,18 @@ public static IApplicationBuilder UseMvcJQueryDataTables(this IApplicationBuilde
             if(settings == null)
             {
                 throw new InvalidOperationException("Unable to find the required services. Please add all the required services by calling 'IServiceCollection.{}' inside the call to 'ConfigureServices(...)' in the application startup code.");
-            } 
+            }
+            app.UseStaticFiles();
 
-            app.UseStaticFiles(new StaticFileOptions
             {
-                FileProvider = settings.FileProvider,
-            });
+                var options = new StaticFileOptions
+                {
+                    RequestPath = "",
+                    FileProvider = settings.FileProvider
+                };
+
+                app.UseStaticFiles(options);
+            }
             return app;
         }
     }

Mvc.JQuery.DataTables.Common/Mvc.JQuery.DataTables.Common.csproj

@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>  
     <RootNamespace>Mvc.JQuery.DataTables.Common</RootNamespace>
     <AssemblyName>Mvc.JQuery.DataTables.Common</AssemblyName>
     <PackageId>Mvc.JQuery.DataTables.Common</PackageId>
-     <PackageVersion>1.0.0</PackageVersion>
-     <Authors>Harry McIntyre</Authors>
-     <Description>Popular lib for using DataTables.net with IQueryable. This package contain x-platform shared code. Install either Mvc.JQuery.DataTables for MVC5 or Mvc.JQuery.DataTables.AspNetCore for AspNetCore</Description>
-     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-     <PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
-     <Copyright>Harry McIntyre</Copyright>
-     <PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
-     <PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl>
+    <PackageVersion>1.0.0</PackageVersion>
+    <Authors>Harry McIntyre</Authors>
+    <Description>Popular lib for using DataTables.net with IQueryable. This package contain x-platform shared code. Install either Mvc.JQuery.DataTables for MVC5 or Mvc.JQuery.DataTables.AspNetCore for AspNetCore</Description>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
+    <Copyright>Harry McIntyre</Copyright>
+    <PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
+    <PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl>
   </PropertyGroup>
 
   <ItemGroup>

Mvc.JQuery.Datatables/Mvc.JQuery.Datatables.csproj

@@ -8,12 +8,13 @@
 
     <PackageVersion>1.0.0</PackageVersion>
     <Authors>Harry McIntyre</Authors>
-    <Description>Popular lib for using DataTables.net with IQueryable. Install this package to use with MVC5etCore</Description>
+    <Description>Popular lib for using DataTables.net with IQueryable. Install this package to use with MVC5</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/mcintyre321/mvc.jquery.datatables</PackageProjectUrl>
     <Copyright>Harry McIntyre</Copyright>
     <PackageTags>jquery datatables iqueryable razor asp mvc mvc5</PackageTags>
-    <PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl>  </PropertyGroup>
+    <PackageLicenseUrl>https://github.com/mcintyre321/mvc.jquery.datatables/blob/master/License.</PackageLicenseUrl> 
+  </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.Mvc" version="5.2.3" />