From 93d4bfcd7a1bf6d3744267f4cc4dd8057991fec0 Mon Sep 17 00:00:00 2001 From: sbwalker Date: Mon, 14 Oct 2024 16:21:03 -0400 Subject: [PATCH] When displaying Database Type use SQL Server rather than LocalDB to avoid confusion --- Oqtane.Client/Modules/Admin/Site/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Sql/Index.razor | 27 +++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index c906b19c..ff94804a 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -571,7 +571,7 @@ if (tenant != null) { _tenant = tenant.Name; - _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name; + _database = _databases.Find(item => item.DBType == tenant.DBType && item.Name != "LocalDB")?.Name; _connectionstring = tenant.DBConnectionString; } } diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index 6d0dee92..476ebd1e 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -83,24 +83,15 @@ else { @if (_connection != "-") { -
- -
- @if (_databases != null) - { - - } -
-
@if (!string.IsNullOrEmpty(_tenant)) { -
+
+ +
+ +
+
+
@@ -204,12 +195,12 @@ else { _connectionstring = _connections[_connection].ToString(); _tenant = ""; - _databasetype = "-"; + _databasetype = ""; var tenant = _tenants.FirstOrDefault(item => item.DBConnectionString == _connection); if (tenant != null) { _tenant = tenant.Name; - _databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType).Name; + _databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType && item.Name != "LocalDB").Name; } } else