Merge pull request #79 from AbdoMahfoz/bug-targetChildList

Fixed a bug where having any non generic property in DbContext would cause the code to crash
edandersen · Nov 21, 2023 · 3dc5d04 · 3dc5d04
2 parents 02e46da + b483515
commit 3dc5d04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -353,3 +353,4 @@ MigrationBackup/
 /src/DotNetEd.CoreAdmin/out/*
 /src/DotNetEd.CoreAdmin/out/*
 /src/DotNetEd.CoreAdmin/out/*
+.idea/
diff --git a/src/DotNetEd.CoreAdmin/Controllers/CoreAdminDataController.cs b/src/DotNetEd.CoreAdmin/Controllers/CoreAdminDataController.cs
@@ -94,7 +94,8 @@ private object GetDbSetValueOrNull(string dbSetName, out DbContext dbContextObje
                                 var propsOnDbContext = dbContextObject.GetType().GetProperties();
 
                                 var targetChildListOnDbContext = dbContextObject.GetType().GetProperties()
-                                    .FirstOrDefault(p => p.PropertyType.GetGenericTypeDefinition() == typeof(DbSet<>)
+                                    .FirstOrDefault(p => p.PropertyType.IsGenericType
+                                    && p.PropertyType.GetGenericTypeDefinition() == typeof(DbSet<>)
                                     && p.PropertyType.GetGenericArguments().First().FullName == typeOfChild.PrincipalEntityType.Name);
 
                                 var primaryKey2 = dbContextObject.Model.FindEntityType(typeOfChild.PrincipalEntityType.Name).FindPrimaryKey();