Diplomarbeit-Absolventenverein/oqtane.framework
6
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

set the DefaultDBType as the default database option in the Installer and Add Site UI

Browse Source
This commit is contained in:
Shaun Walker
2021-06-11 08:43:46 -04:00
parent aa5aca3a8e
commit 8f944e29ac
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Installer/Installer.razor
View File

@ -31,7 +31,14 @@
{
foreach (var database in _databases)
{
<option value="@database.Name">@Localizer[@database.Name]</option>
if (database.IsDefault)
{
<option value="@database.Name" selected>@Localizer[@database.Name]</option>
}
else
{
<option value="@database.Name">@Localizer[@database.Name]</option>
}
}
}
</select>

9
Oqtane.Client/Modules/Admin/Sites/Add.razor
View File

@ -130,7 +130,14 @@ else
<select id="databaseType" class="custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
@foreach (var database in _databases)
{
<option value="@database.Name">@Localizer[@database.Name]</option>
if (database.IsDefault)
{
<option value="@database.Name" selected>@Localizer[@database.Name]</option>
}
else
{
<option value="@database.Name">@Localizer[@database.Name]</option>
}
}
</select>
</td>

15
Oqtane.Server/Controllers/DatabaseController.cs
View File

@ -1,6 +1,7 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Shared;
@ -10,17 +11,25 @@ namespace Oqtane.Controllers
public class DatabaseController : Controller
{
private IOptions<List<Database>> _databaseOptions;
private IConfigManager _config;
public DatabaseController(IOptions<List<Database>> databaseOptions)
public DatabaseController(IOptions<List<Database>> databaseOptions, IConfigManager config)
{
_databaseOptions = databaseOptions;
_config = config;
}
// GET: api/<controller>
[HttpGet]
public IEnumerable<Models.Database> Get()
public IEnumerable<Database> Get()
{
return _databaseOptions.Value;
var databases = _databaseOptions.Value;
var master = _config.GetSetting(SettingKeys.DatabaseSection, SettingKeys.DatabaseTypeKey, "");
if (master != "" && databases.Exists(item => item.DBType == master))
{
databases.Find(item => item.DBType == master).IsDefault = true;
}
return databases;
}
}
}

5
Oqtane.Shared/Models/Database.cs
View File

@ -19,5 +19,10 @@ namespace Oqtane.Models
/// Type of DB using the full namespace, like `Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Database.SqlServer`
/// </summary>
public string DBType { get; set; }
/// <summary>
/// whether this item is the default database provider ( ie. specified by DefaultDBType in appsettings.json )
/// </summary>
public bool IsDefault { get; set; }
}
}