#3237: Unable to edit AdminSeats with CoreAdmin on MasterUsers

src/DotNetEd.CoreAdmin/Controllers/CoreAdminDataController.cs

@@ -49,7 +49,7 @@ public IActionResult Index(string id)
 						var dbContextObject = (DbContext)this.HttpContext.RequestServices.GetRequiredService(dbSetEntity.DbContextType);
 						if (dbSetEntity.ConnectionString != null)
 						{
-							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString;
+							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString();
 						}
 
 						var query = dbContextObject.Set(viewModel.EntityType);
@@ -98,7 +98,7 @@ private object GetDbSetValueOrNull(string dbSetName, out DbContext dbContextObje
 						dbContextObject = (DbContext)this.HttpContext.RequestServices.GetRequiredService(dbSetEntity.DbContextType);
 						if (dbSetEntity.ConnectionString != null)
 						{
-							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString;
+							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString();
 						}
 
 						typeOfEntity = dbSetProperty.PropertyType.GetGenericArguments()[0];
@@ -364,7 +364,7 @@ public async Task<IActionResult> DeleteEntityPost([FromForm] DataDeleteViewModel
 						var dbContextObject = (DbContext)this.HttpContext.RequestServices.GetRequiredService(dbSetEntity.DbContextType);
 						if (dbSetEntity.ConnectionString != null)
 						{
-							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString;
+							dbContextObject.Database.GetDbConnection().ConnectionString = dbSetEntity.ConnectionString();
 						}
 						var dbSetValue = dbSetProperty.GetValue(dbContextObject);
 

src/DotNetEd.CoreAdmin/CoreAdminConfigurationExtensions.cs

@@ -7,7 +7,6 @@
 using Npgsql;
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
@@ -133,12 +132,12 @@ private static void FindDbContexts(IServiceCollection services, CoreAdminOptions
 				if (serviceType.IsSubclassOf(typeof(DbContext)) &&
 					!discoveredServices.Any(x => x.DbContextType == serviceType))
 				{
-					Dictionary<string, string> databaseName2ConnectionStrings = new Dictionary<string, string>();
-					if (options.Context2ConnectionStrings != null && options.Context2ConnectionStrings.TryGetValue(serviceType.Name, out List<string> connectionStrings))
+					Dictionary<string, Func<string>> databaseName2ConnectionStrings = new Dictionary<string, Func<string>>();
+					if (options.Context2ConnectionStrings != null && options.Context2ConnectionStrings.TryGetValue(serviceType.Name, out List<Func<string>> connectionStrings))
 					{
 						foreach (var connectionString in connectionStrings)
 						{
-							NpgsqlConnectionStringBuilder builder = new NpgsqlConnectionStringBuilder(connectionString);
+							NpgsqlConnectionStringBuilder builder = new NpgsqlConnectionStringBuilder(connectionString());
 							databaseName2ConnectionStrings.Add(builder.Database, connectionString);
 						}
 					}

src/DotNetEd.CoreAdmin/CoreAdminSecurityOptions.cs

@@ -19,7 +19,7 @@ public class CoreAdminOptions
 		public GridFilterMode FilterMode { get; set; }
 		public string Title { get; set; } = "Amplifi Admin Portal";
 		public string FirebaseApiKey { get; set; }
-		public Dictionary<string, List<string>> Context2ConnectionStrings { get; set; }
+		public Dictionary<string, List<Func<string>>> Context2ConnectionStrings { get; set; }
 		public string ApiUrl { get; set; }
 		public string AllowedRole { get; set; }
 		public long SuperAdminId { get; set; }

src/DotNetEd.CoreAdmin/DiscoveredDbSetEntityType.cs

@@ -8,6 +8,6 @@ public class DiscoveredDbSetEntityType
 		public string Name { get; internal set; }
 		public Type DbSetType { get; internal set; }
 		public Type UnderlyingType { get; internal set; }
-		public string ConnectionString { get; internal set; }
+		public Func<string> ConnectionString { get; internal set; }
 	}
 }

src/DotNetEd.CoreAdmin/DotNetEd.CoreAdmin.csproj

@@ -6,7 +6,7 @@
 		<PreserveCompilationContext>false</PreserveCompilationContext>
 		<SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
 		<PackageId>AmplifiAdminPortal</PackageId>
-		<PackageVersion>3.0.2</PackageVersion>
+		<PackageVersion>3.0.3</PackageVersion>
 		<Description>Automagically add an Admin Panel to your .NET 8 web app.</Description>
 		<Title>Core Admin Panel for ASP.NET Core</Title>
 		<Authors>amplifi</Authors>

src/DotNetEd.CoreAdmin/Views/Shared/EditorTemplates/Enum.cshtml

@@ -1,12 +1,18 @@
 @model object
-@if (ViewData.ModelMetadata.ModelType.IsEnum)
+@if (ViewData.ModelMetadata.ModelType.IsEnum || Nullable.GetUnderlyingType(ViewData.ModelMetadata.ModelType)?.IsEnum == true)
 {
-    var values = Enum.GetValues(ViewData.ModelMetadata.ModelType);
-    var names = Enum.GetNames(ViewData.ModelMetadata.ModelType);
+    var propertyType = Nullable.GetUnderlyingType(ViewData.ModelMetadata.ModelType) ?? ViewData.ModelMetadata.ModelType;
+    var values = Enum.GetValues(propertyType);
+    var names = Enum.GetNames(propertyType);
     var items = new List<SelectListItem>();
+    if (Nullable.GetUnderlyingType(ViewData.ModelMetadata.ModelType) != null) // If nullable type add null item
+    {
+        items.Add(new SelectListItem() { Text = "", Value = null, Selected = (Model == null) });
+    }
+
     for (var i = 0; i < values.Length; i++)
     {
-        items.Add(new SelectListItem() { Text = names[i], Value = values.GetValue(i).ToString(), Selected = (Model.ToString() == values.GetValue(i).ToString()) });
+        items.Add(new SelectListItem() { Text = names[i], Value = values.GetValue(i).ToString(), Selected = (Model?.ToString() == values.GetValue(i).ToString()) });
     }
 
     @Html.DropDownList("", items, new {@class = "form-control"})

src/DotNetEd.CoreAdmin/Views/Shared/_CoreAdminLayout.cshtml

@@ -49,6 +49,7 @@
             <a class="mr-0 pl-1" href="@Url.Action("Index", "CoreAdmin")">@options?.Title</a>
             &nbsp;
             <a class="pl-2" href="@Url.Action("Logout", "Account")">Logout</a>
+            &nbsp;&nbsp;
         </div>
     </nav>