tsai
/
abp-next-admin2
mirror of https://github.com/colinin/abp-next-admin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1542 from colinin/system-settings-provider 

fix: Remove system settings provider configuration
dev
yx lin 1 day ago
committed by GitHub
parent
9ec373967f 04791f1def
commit
6dd9ea0c35
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      aspnet-core/LINGYUN.MicroService.Aspire.slnx
  2. 14
      aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/SystemGroupSettingDefinitionProvider.cs
  3. 14
      aspnet-core/services/LY.MicroService.Applications.Single/Settings/SystemGroupSettingDefinitionProvider.cs
  4. 16
      aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/SystemGroupSettingDefinitionProvider.cs

7
aspnet-core/LINGYUN.MicroService.Aspire.slnx
View File

@ -558,13 +558,6 @@
<Project Path="modules/elsa/LINGYUN.Abp.Elsa.Server/LINGYUN.Abp.Elsa.Server.csproj" />
<Project Path="modules/elsa/LINGYUN.Abp.Elsa/LINGYUN.Abp.Elsa.csproj" />
</Folder>
<Folder Name="/modules/workflow/elsa3/">
<Project Path="modules/elsa/LINGYUN.Abp.ElsaNext.EntityFrameworkCore.PostgreSql/LINGYUN.Abp.ElsaNext.EntityFrameworkCore.PostgreSql.csproj" Id="eac3cdfe-670e-41fd-a7cf-67a38de69f97" />
<Project Path="modules/elsa/LINGYUN.Abp.ElsaNext.EntityFrameworkCore/LINGYUN.Abp.ElsaNext.EntityFrameworkCore.csproj" Id="96f6e53d-2e56-4fb2-b603-3e493f588c69" />
<Project Path="modules/elsa/LINGYUN.Abp.ElsaNext.Server/LINGYUN.Abp.ElsaNext.Server.csproj" />
<Project Path="modules/elsa/LINGYUN.Abp.ElsaNext.Studio/LINGYUN.Abp.ElsaNext.Studio.csproj" Id="3550e74f-776d-4f6c-bc6a-2ba7618f5d41" />
<Project Path="modules/elsa/LINGYUN.Abp.ElsaNext/LINGYUN.Abp.ElsaNext.csproj" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests/LINGYUN.Abp.Aliyun.Tests/LINGYUN.Abp.Aliyun.Tests.csproj" />
<Project Path="tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests/LINGYUN.Abp.BlobStoring.Aliyun.Tests.csproj" />

14
aspnet-core/aspire/LINGYUN.Abp.MicroService.AdminService/SystemGroupSettingDefinitionProvider.cs
View File

@ -42,12 +42,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithGroup(GroupName, L("Settings:System"), order: 0)
?.WithParent("Language", L("Settings:System.Language"), order: 0)
?.WithOrder(0)
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)))
?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName);
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)));
var timezoneSetting = context.GetOrNull(TimingSettingNames.TimeZone);
if (timezoneSetting != null)
@ -68,12 +63,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
requiredPermissions: [Volo.Abp.SettingManagement.SettingManagementPermissions.TimeZone])
.WithParent("Timing", L("Settings:System.Timing"), order: 0)
.WithOrder(1)
.WithOptions(timezones)
.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName);
.WithOptions(timezones);
}
}

14
aspnet-core/services/LY.MicroService.Applications.Single/Settings/SystemGroupSettingDefinitionProvider.cs
View File

@ -37,12 +37,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithGroup(GroupName, L("Settings:System"), order: 0)
?.WithParent("Language", L("Settings:System.Language"), order: 0)
?.WithOrder(0)
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)))
?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName);
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)));
var timezoneSetting = context.GetOrNull(TimingSettingNames.TimeZone);
if (timezoneSetting != null)
@ -63,12 +58,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
requiredPermissions: [Volo.Abp.SettingManagement.SettingManagementPermissions.TimeZone])
.WithParent("Timing", L("Settings:System.Timing"), order: 0)
.WithOrder(1)
.WithOptions(timezones)
.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName);
.WithOptions(timezones);
}
}

16
aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/SystemGroupSettingDefinitionProvider.cs
View File

@ -43,13 +43,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
?.WithGroup(GroupName, L("Settings:System"), order: 0)
?.WithParent("Language", L("Settings:System.Language"), order: 0)
?.WithOrder(0)
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)))
?.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName,
UserSettingValueProvider.ProviderName);
?.WithOptions(LocalizationOptions.Languages.Select(l => new NameValue<string>(l.DisplayName, l.CultureName)));
var timezoneSetting = context.GetOrNull(TimingSettingNames.TimeZone);
if (timezoneSetting != null)
@ -70,13 +64,7 @@ public class SystemGroupSettingDefinitionProvider : SettingDefinitionProvider
requiredPermissions: [Volo.Abp.SettingManagement.SettingManagementPermissions.TimeZone])
.WithParent("Timing", L("Settings:System.Timing"), order: 0)
.WithOrder(1)
.WithOptions(timezones)
.ReplaceProviders(
DefaultValueSettingValueProvider.ProviderName,
ConfigurationSettingValueProvider.ProviderName,
GlobalSettingValueProvider.ProviderName,
TenantSettingValueProvider.ProviderName,
UserSettingValueProvider.ProviderName);
.WithOptions(timezones);
}
}

Write Preview
Loading…
Cancel
Save