Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tenant repository bug (#329)

Browse Source 
Database Manager bug
This commit is contained in:
Pavel Veselý 2020-04-03 17:36:59 +02:00 committed by GitHub
parent 7492b018e3
commit 2433cc06be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Oqtane.Server/Infrastructure/DatabaseManager.cs
View File

@ -63,6 +63,7 @@ namespace Oqtane.Infrastructure
if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString)) if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString))
{ {
BuildDefaultSite(password,email); BuildDefaultSite(password,email);
} }
} }
@ -319,10 +320,13 @@ namespace Oqtane.Infrastructure
var userRoles = scope.ServiceProvider.GetRequiredService<IUserRoleRepository>(); var userRoles = scope.ServiceProvider.GetRequiredService<IUserRoleRepository>();
var folders = scope.ServiceProvider.GetRequiredService<IFolderRepository>(); var folders = scope.ServiceProvider.GetRequiredService<IFolderRepository>();
var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>(); var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>();
var tenants = scope.ServiceProvider.GetRequiredService<ITenantRepository>();
var tenant = tenants.GetTenants().First();
var site = new Site var site = new Site
{ {
TenantId = -1, TenantId = tenant.TenantId,
Name = "Default Site", Name = "Default Site",
LogoFileId = null, LogoFileId = null,
DefaultThemeType = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme), DefaultThemeType = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme),
@ -341,6 +345,8 @@ namespace Oqtane.Infrastructure
DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser), DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser),
}; };
CreateHostUser(folders, userRoles, roles, users, identityUserManager, user); CreateHostUser(folders, userRoles, roles, users, identityUserManager, user);
tenant.IsInitialized = true;
tenants.UpdateTenant(tenant);
} }
} }

4
Oqtane.Server/Repository/TenantRepository.cs
View File

@ -38,9 +38,9 @@ namespace Oqtane.Repository
public Tenant UpdateTenant(Tenant tenant) public Tenant UpdateTenant(Tenant tenant)
{ {
var oldTenant = GetTenant(tenant.TenantId); var oldTenant =_db.Tenant.AsNoTracking().FirstOrDefault(t=> t.TenantId == tenant.TenantId);
if (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)) if (oldTenant != null && (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
{ {
throw new InvalidOperationException("Unable to rename the master tenant."); throw new InvalidOperationException("Unable to rename the master tenant.");
} }