Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename EmailSettingManagement to EmailSetting. #7726

Merged
merged 1 commit into from
Feb 18, 2021
Merged

Rename EmailSettingManagement to EmailSetting. #7726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ion.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissionDefinitionProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class SettingManagementPermissionDefinitionProvider : PermissionDefinitio
public override void Define(IPermissionDefinitionContext context)
{
var moduleGroup = context.AddGroup(SettingManagementPermissions.GroupName, L("Permission:SettingManagement"));
moduleGroup.AddPermission(SettingManagementPermissions.EmailSettingManagement, L("Permission:EmailSettingManagement"), multiTenancySide: MultiTenancySides.Host);
moduleGroup.AddPermission(SettingManagementPermissions.EmailSetting, L("Permission:EmailSetting"), multiTenancySide: MultiTenancySides.Host);
}

private static LocalizableString L(string name)
Expand Down
2 changes: 1 addition & 1 deletion ...nagement.Application.Contracts/Volo/Abp/SettingManagement/SettingManagementPermissions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class SettingManagementPermissions
{
public const string GroupName = "SettingManagement";

public const string EmailSettingManagement = GroupName + ".EmailSettingManagement";
public const string EmailSetting = GroupName + ".EmailSetting";

public static string[] GetAll()
{
Expand Down
2 changes: 1 addition & 1 deletion ...o.Abp.SettingManagement.Application/Volo/Abp/SettingManagement/EmailSettingsAppService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Volo.Abp.SettingManagement
{
[Authorize(SettingManagementPermissions.EmailSettingManagement)]
[Authorize(SettingManagementPermissions.EmailSetting)]
public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService
{
protected ISettingManager SettingManager { get; }
Expand Down
2 changes: 1 addition & 1 deletion ...ting-management/src/Volo.Abp.SettingManagement.Blazor/AbpSettingManagementBlazorModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)

Configure<SettingManagementComponentOptions>(options =>
{
options.Contributors.Add(new EmailSettingManagementPageContributor());
options.Contributors.Add(new EmailSettingPageContributor());
});
}
}
Expand Down
6 changes: 3 additions & 3 deletions .../EmailSettingManagementPageContributor.cs → ...r/Settings/EmailSettingPageContributor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Volo.Abp.SettingManagement.Blazor.Settings
{
public class EmailSettingManagementPageContributor: ISettingComponentContributor
public class EmailSettingPageContributor: ISettingComponentContributor
{
public async Task ConfigureAsync(SettingComponentCreationContext context)
{
Expand All @@ -20,7 +20,7 @@ public async Task ConfigureAsync(SettingComponentCreationContext context)
context.Groups.Add(
new SettingComponentGroup(
"Volo.Abp.SettingManagement",
l["Menu:EmailSettingManagement"],
l["Menu:EmailSetting"],
typeof(EmailSettingGroupViewComponent)
)
);
Expand All @@ -35,7 +35,7 @@ private async Task<bool> CheckPermissionsInternalAsync(SettingComponentCreationC
{
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();

return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSettingManagement);
return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting);
}
}
}
4 changes: 2 additions & 2 deletions ....Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "Einstellungen",
"SuccessfullySaved": "Erfolgreich gespeichert",
"Permission:SettingManagement": "Einstellungen-Verwaltung",
"Permission:EmailSettingManagement": "E-Mail-Einstellungen",
"Menu:EmailSettingManagement": "E-Mail-Verwaltung",
"Permission:EmailSetting": "E-Mail-Einstellungen",
"Menu:EmailSetting": "E-Mail-Einstellung",
"SmtpHost": "Host",
"SmtpPort": "Port",
"SmtpUserName": "Benutzername",
Expand Down
4 changes: 2 additions & 2 deletions ...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "Settings",
"SuccessfullySaved": "Successfully saved",
"Permission:SettingManagement": "Setting Management",
"Permission:EmailSettingManagement": "Email Settings",
"Menu:EmailSettingManagement": "Email management",
"Permission:EmailSetting": "Email Setting",
"Menu:EmailSetting": "Email Setting",
"SmtpHost": "Host",
"SmtpPort": "Port",
"SmtpUserName": "User name",
Expand Down
4 changes: 2 additions & 2 deletions ...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "Configuraciones",
"SuccessfullySaved": "Guardado correctamente",
"Permission:SettingManagement": "Configuraciones de correo electronico",
"Permission:EmailSettingManagement": "Administración Configuraciones",
"Menu:EmailSettingManagement": "Administración de correo electronico",
"Permission:EmailSetting": "Configuración de correo electrónico",
"Menu:EmailSetting": "Configuración de correo electrónico",
"SmtpHost": "Host",
"SmtpPort": "Puerto",
"SmtpUserName": "Nombre de usuario",
Expand Down
4 changes: 2 additions & 2 deletions ...ain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "Ayarlar",
"SuccessfullySaved": "Başarıyla Kaydedildi",
"Permission:SettingManagement": "Ayarlar yönetimi",
"Permission:EmailSettingManagement": "Email Ayarlar",
"Menu:EmailSettingManagement": "Email yönetimi",
"Permission:EmailSetting": "Email Ayarlar",
"Menu:EmailSetting": "Email Ayarlar",
"SmtpHost": "Sunucu",
"SmtpPort": "Port",
"SmtpUserName": "Kullanıcı adı",
Expand Down
4 changes: 2 additions & 2 deletions ...hared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "设置",
"SuccessfullySaved": "保存成功",
"Permission:SettingManagement": "设置管理",
"Permission:EmailSettingManagement": "邮件设置",
"Menu:EmailSettingManagement": "邮件管理",
"Permission:EmailSetting": "邮件设置",
"Menu:EmailSetting": "邮件设置",
"SmtpHost": "主机",
"SmtpPort": "端口",
"SmtpUserName": "用户名",
Expand Down
2 changes: 1 addition & 1 deletion ...es/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override void ConfigureServices(ServiceConfigurationContext context)

Configure<SettingManagementPageOptions>(options =>
{
options.Contributors.Add(new EmailSettingManagementPageContributor());
options.Contributors.Add(new EmailSettingPageContributor());
});

Configure<AbpVirtualFileSystemOptions>(options =>
Expand Down
8 changes: 4 additions & 4 deletions .../EmailSettingManagementPageContributor.cs → ...b/Settings/EmailSettingPageContributor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Volo.Abp.SettingManagement.Web.Settings
{
public class EmailSettingManagementPageContributor: ISettingPageContributor
public class EmailSettingPageContributor: ISettingPageContributor
{
public async Task ConfigureAsync(SettingPageCreationContext context)
{
Expand All @@ -20,8 +20,8 @@ public async Task ConfigureAsync(SettingPageCreationContext context)
var l = context.ServiceProvider.GetRequiredService<IStringLocalizer<AbpSettingManagementResource>>();
context.Groups.Add(
new SettingPageGroup(
"Volo.Abp.SettingManagement",
l["Menu:EmailSettingManagement"],
"Volo.Abp.EmailSetting",
l["Menu:EmailSetting"],
typeof(EmailSettingGroupViewComponent)
)
);
Expand All @@ -36,7 +36,7 @@ private async Task<bool> CheckPermissionsInternalAsync(SettingPageCreationContex
{
var authorizationService = context.ServiceProvider.GetRequiredService<IAuthorizationService>();

return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSettingManagement);
return await authorizationService.IsGrantedAsync(SettingManagementPermissions.EmailSetting);
}
}
}