Merge pull request #1467 from sbwalker/dev
set the DefaultDBType as the default database option in the Installer and Add Site UI
This commit is contained in:
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user