Skip to content

Commit cd9d7f5

Browse files
committed
resolved aspnetboilerplate/aspnetboilerplate#4446: use 1 as tenantId when multi tenancy is disabled
1 parent 46b6d4b commit cd9d7f5

File tree

2 files changed

+25
-15
lines changed

2 files changed

+25
-15
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/DefaultLanguagesCreator.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Linq;
33
using Microsoft.EntityFrameworkCore;
44
using Abp.Localization;
5+
using Abp.MultiTenancy;
56

67
namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed.Host
78
{
@@ -13,20 +14,21 @@ public class DefaultLanguagesCreator
1314

1415
private static List<ApplicationLanguage> GetInitialLanguages()
1516
{
17+
var tenantId = AbpProjectNameConsts.MultiTenancyEnabled ? null : (int?)MultiTenancyConsts.DefaultTenantId;
1618
return new List<ApplicationLanguage>
1719
{
18-
new ApplicationLanguage(null, "en", "English", "famfamfam-flags gb"),
19-
new ApplicationLanguage(null, "ar", "العربية", "famfamfam-flags sa"),
20-
new ApplicationLanguage(null, "de", "German", "famfamfam-flags de"),
21-
new ApplicationLanguage(null, "it", "Italiano", "famfamfam-flags it"),
22-
new ApplicationLanguage(null, "fr", "Français", "famfamfam-flags fr"),
23-
new ApplicationLanguage(null, "pt-BR", "Português", "famfamfam-flags br"),
24-
new ApplicationLanguage(null, "tr", "Türkçe", "famfamfam-flags tr"),
25-
new ApplicationLanguage(null, "ru", "Русский", "famfamfam-flags ru"),
26-
new ApplicationLanguage(null, "zh-Hans", "简体中文", "famfamfam-flags cn"),
27-
new ApplicationLanguage(null, "es-MX", "Español México", "famfamfam-flags mx"),
28-
new ApplicationLanguage(null, "nl", "Nederlands", "famfamfam-flags nl"),
29-
new ApplicationLanguage(null, "ja", "日本語", "famfamfam-flags jp")
20+
new ApplicationLanguage(tenantId, "en", "English", "famfamfam-flags gb"),
21+
new ApplicationLanguage(tenantId, "ar", "العربية", "famfamfam-flags sa"),
22+
new ApplicationLanguage(tenantId, "de", "German", "famfamfam-flags de"),
23+
new ApplicationLanguage(tenantId, "it", "Italiano", "famfamfam-flags it"),
24+
new ApplicationLanguage(tenantId, "fr", "Français", "famfamfam-flags fr"),
25+
new ApplicationLanguage(tenantId, "pt-BR", "Português", "famfamfam-flags br"),
26+
new ApplicationLanguage(tenantId, "tr", "Türkçe", "famfamfam-flags tr"),
27+
new ApplicationLanguage(tenantId, "ru", "Русский", "famfamfam-flags ru"),
28+
new ApplicationLanguage(tenantId, "zh-Hans", "简体中文", "famfamfam-flags cn"),
29+
new ApplicationLanguage(tenantId, "es-MX", "Español México", "famfamfam-flags mx"),
30+
new ApplicationLanguage(tenantId, "nl", "Nederlands", "famfamfam-flags nl"),
31+
new ApplicationLanguage(tenantId, "ja", "日本語", "famfamfam-flags jp")
3032
};
3133
}
3234

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/DefaultSettingsCreator.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.EntityFrameworkCore;
33
using Abp.Configuration;
44
using Abp.Localization;
5+
using Abp.MultiTenancy;
56
using Abp.Net.Mail;
67

78
namespace AbpCompanyName.AbpProjectName.EntityFrameworkCore.Seed.Host
@@ -17,12 +18,19 @@ public DefaultSettingsCreator(AbpProjectNameDbContext context)
1718

1819
public void Create()
1920
{
21+
int? tenantId = null;
22+
23+
if (AbpProjectNameConsts.MultiTenancyEnabled == false)
24+
{
25+
tenantId = MultiTenancyConsts.DefaultTenantId;
26+
}
27+
2028
// Emailing
21-
AddSettingIfNotExists(EmailSettingNames.DefaultFromAddress, "[email protected]");
22-
AddSettingIfNotExists(EmailSettingNames.DefaultFromDisplayName, "mydomain.com mailer");
29+
AddSettingIfNotExists(EmailSettingNames.DefaultFromAddress, "[email protected]", tenantId);
30+
AddSettingIfNotExists(EmailSettingNames.DefaultFromDisplayName, "mydomain.com mailer", tenantId);
2331

2432
// Languages
25-
AddSettingIfNotExists(LocalizationSettingNames.DefaultLanguage, "en");
33+
AddSettingIfNotExists(LocalizationSettingNames.DefaultLanguage, "en", tenantId);
2634
}
2735

2836
private void AddSettingIfNotExists(string name, string value, int? tenantId = null)

0 commit comments

Comments
 (0)