Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-09 00:41:37 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1360] Added fallback when retrieving display attribute name value

Browse Source
This commit is contained in:
Rui Tome 2023-08-03 15:00:03 +01:00
parent 118cd7ac62
commit 26283612cf
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Admin/Models/CreateProviderModel.cs
View File

@ -42,24 +42,24 @@ public class CreateProviderModel : IValidatableObject
case ProviderType.Msp: case ProviderType.Msp:
if (string.IsNullOrWhiteSpace(OwnerEmail)) if (string.IsNullOrWhiteSpace(OwnerEmail))
{ {
var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName(); var ownerEmailDisplayName = nameof(OwnerEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(OwnerEmail);
yield return new ValidationResult($"The {ownerEmailDisplayName} field is required."); yield return new ValidationResult($"The {ownerEmailDisplayName} field is required.");
} }
break; break;
case ProviderType.Reseller: case ProviderType.Reseller:
if (string.IsNullOrWhiteSpace(Name)) if (string.IsNullOrWhiteSpace(Name))
{ {
var nameDisplayName = nameof(Name).GetDisplayAttribute<CreateProviderModel>()?.GetName(); var nameDisplayName = nameof(Name).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(Name);
yield return new ValidationResult($"The {nameDisplayName} field is required."); yield return new ValidationResult($"The {nameDisplayName} field is required.");
} }
if (string.IsNullOrWhiteSpace(BusinessName)) if (string.IsNullOrWhiteSpace(BusinessName))
{ {
var businessNameDisplayName = nameof(BusinessName).GetDisplayAttribute<CreateProviderModel>()?.GetName(); var businessNameDisplayName = nameof(BusinessName).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(BusinessName);
yield return new ValidationResult($"The {businessNameDisplayName} field is required."); yield return new ValidationResult($"The {businessNameDisplayName} field is required.");
} }
if (string.IsNullOrWhiteSpace(BillingEmail)) if (string.IsNullOrWhiteSpace(BillingEmail))
{ {
var billingEmailDisplayName = nameof(BillingEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName(); var billingEmailDisplayName = nameof(BillingEmail).GetDisplayAttribute<CreateProviderModel>()?.GetName() ?? nameof(BillingEmail);
yield return new ValidationResult($"The {billingEmailDisplayName} field is required."); yield return new ValidationResult($"The {billingEmailDisplayName} field is required.");
} }
break; break;