From 1d53bee97a9b21e0fef3407c62e5603818dbc660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ahmet=20=C3=87otur?= Date: Sun, 15 Mar 2020 00:36:39 +0300 Subject: [PATCH] some requested changes resolved --- .../Abp/TenantManagement/TenantCreateDto.cs | 20 +------------------ .../Localization/Resources/en.json | 5 +---- .../Localization/Resources/tr.json | 5 +---- .../Volo/Abp/TenantManagement/TenantConsts.cs | 4 ---- .../Tenants/CreateModal.cshtml | 6 +++--- .../Tenants/CreateModal.cshtml.cs | 5 +---- 6 files changed, 7 insertions(+), 38 deletions(-) diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs index 46f3f9ff73..e3c4c3ba49 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Application.Contracts/Volo/Abp/TenantManagement/TenantCreateDto.cs @@ -7,28 +7,10 @@ using Volo.Abp.TenantManagement.Localization; namespace Volo.Abp.TenantManagement { - public class TenantCreateDto : TenantCreateOrUpdateDtoBase, IValidatableObject + public class TenantCreateDto : TenantCreateOrUpdateDtoBase { public string AdminEmailAddress { get; set; } public string AdminPassword { get; set; } - - public IEnumerable Validate(ValidationContext validationContext) - { - var l = validationContext.GetRequiredService>(); - - var isValidEmail = - Regex.IsMatch(AdminEmailAddress, TenantConsts.EmailRegex, RegexOptions.IgnoreCase); - - if (string.IsNullOrWhiteSpace(AdminEmailAddress) || !isValidEmail) - { - yield return new ValidationResult(l["InvalidAdminProperties"], new[] { nameof(AdminEmailAddress) }); - } - - if (string.IsNullOrWhiteSpace(AdminPassword)) - { - yield return new ValidationResult(l["InvalidAdminProperties"], new[] { nameof(AdminPassword) }); - } - } } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json index 3141f62633..fc51f00750 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json @@ -15,9 +15,6 @@ "Permission:Edit": "Edit", "Permission:Delete": "Delete", "Permission:ManageConnectionStrings": "Manage connection strings", - "Permission:ManageFeatures": "Manage features", - "DisplayName:AdminEmailAddress": "Admin Email Address", - "DisplayName:AdminPassword": "Admin Password", - "InvalidAdminProperties": "Admin email address or password is invalid." + "Permission:ManageFeatures": "Manage features" } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json index ea7d0cf25e..1b6bdca2c2 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json @@ -15,9 +15,6 @@ "Permission:Edit": "Düzenleme", "Permission:Delete": "Silme", "Permission:ManageConnectionStrings": "Bağlantı cümlelerini yönet", - "Permission:ManageFeatures": "Özellikleri yönet", - "DisplayName:AdminEmailAddress": "Yönetici Eposta Adresi", - "DisplayName:AdminPassword": "Yönetici Şifresi", - "InvalidAdminProperties": "Admin eposta adresi veya şifre geçerli değil." + "Permission:ManageFeatures": "Özellikleri yönet" } } \ No newline at end of file diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs index ecaa873a09..328c422ab9 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConsts.cs @@ -3,9 +3,5 @@ public static class TenantConsts { public const int MaxNameLength = 64; - - public const string EmailRegex = - @"^(?("")("".+?(? - + - + - + diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs index 79b7c036c5..aa4c9e92fe 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs @@ -31,18 +31,15 @@ namespace Volo.Abp.TenantManagement.Web.Pages.TenantManagement.Tenants { [Required] [StringLength(TenantConsts.MaxNameLength)] - [Display(Name = "DisplayName:TenantName")] public string Name { get; set; } [Required] + [EmailAddress] [StringLength(TenantConsts.MaxNameLength)] - [Display(Name = "DisplayName:AdminEmailAddress")] public string AdminEmailAddress { get; set; } [Required] [StringLength(TenantConsts.MaxNameLength)] - [EmailAddress] - [Display(Name = "DisplayName:AdminPassword")] public string AdminPassword { get; set; } } }