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.

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

Rename EmailSetting to Emailing. #7868

Merged
merged 1 commit into from
Feb 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.EmailSetting, L("Permission:EmailSetting"), multiTenancySide: MultiTenancySides.Host);
moduleGroup.AddPermission(SettingManagementPermissions.Emailing, L("Permission:Emailing"), multiTenancySide: MultiTenancySides.Host);
}

private static LocalizableString L(string name)
Expand Down
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 EmailSetting = GroupName + ".EmailSetting";
public const string Emailing = GroupName + ".Emailing";

public static string[] GetAll()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Volo.Abp.SettingManagement
{
[Authorize(SettingManagementPermissions.EmailSetting)]
[Authorize(SettingManagementPermissions.Emailing)]
public class EmailSettingsAppService : SettingManagementAppServiceBase, IEmailSettingsAppService
{
protected ISettingManager SettingManager { get; }
Expand Down
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 EmailSettingPageContributor());
options.Contributors.Add(new EmailingPageContributor());
});
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Volo.Abp.SettingManagement.Blazor.Settings
{
public class EmailSettingPageContributor: ISettingComponentContributor
public class EmailingPageContributor: 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:EmailSetting"],
l["Menu:Emailing"],
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.EmailSetting);
return await authorizationService.IsGrantedAsync(SettingManagementPermissions.Emailing);
}
}
}
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:EmailSetting": "E-Mail-Einstellungen",
"Menu:EmailSetting": "E-Mail-Einstellung",
"Permission:Emailing": "E-Mail",
"Menu:Emailing": "E-Mail",
"SmtpHost": "Host",
"SmtpPort": "Port",
"SmtpUserName": "Benutzername",
Expand Down
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:EmailSetting": "Email Setting",
"Menu:EmailSetting": "Email Setting",
"Permission:Emailing": "Emailing",
"Menu:Emailing": "Emailing",
"SmtpHost": "Host",
"SmtpPort": "Port",
"SmtpUserName": "User name",
Expand Down
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:EmailSetting": "Configuración de correo electrónico",
"Menu:EmailSetting": "Configuración de correo electrónico",
"Permission:Emailing": "Configuración",
"Menu:Emailing": "Configuración",
"SmtpHost": "Host",
"SmtpPort": "Puerto",
"SmtpUserName": "Nombre de usuario",
Expand Down
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:EmailSetting": "Email Ayarlar",
"Menu:EmailSetting": "Email Ayarlar",
"Permission:Emailing": "Email",
"Menu:Emailing": "Email",
"SmtpHost": "Sunucu",
"SmtpPort": "Port",
"SmtpUserName": "Kullanıcı adı",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"Settings": "设置",
"SuccessfullySaved": "保存成功",
"Permission:SettingManagement": "设置管理",
"Permission:EmailSetting": "邮件设置",
"Menu:EmailSetting": "邮件设置",
"Permission:Emailing": "邮件",
"Menu:Emailing": "邮件",
"SmtpHost": "主机",
"SmtpPort": "端口",
"SmtpUserName": "用户名",
Expand Down
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 EmailSettingPageContributor());
options.Contributors.Add(new EmailingPageContributor());
});

Configure<AbpVirtualFileSystemOptions>(options =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Volo.Abp.SettingManagement.Web.Settings
{
public class EmailSettingPageContributor: ISettingPageContributor
public class EmailingPageContributor: ISettingPageContributor
{
public async Task ConfigureAsync(SettingPageCreationContext context)
{
Expand All @@ -21,7 +21,7 @@ public async Task ConfigureAsync(SettingPageCreationContext context)
context.Groups.Add(
new SettingPageGroup(
"Volo.Abp.EmailSetting",
l["Menu:EmailSetting"],
l["Menu:Emailing"],
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.EmailSetting);
return await authorizationService.IsGrantedAsync(SettingManagementPermissions.Emailing);
}
}
}