Merge remote-tracking branch 'origin/release-v1.0.0' into Develop/Features/TD-4632-Asacentremanageratanewcentre,Ishouldbeabletoregisterusingapredeterminedemailaddresswithoutadditionalapprovalsteps

sherif-olaboye · sherif-olaboye · commit 78b6e4a494a8 · 2024-11-05T09:14:38.000Z
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/SearchableAdminViewModel.cs
@@ -17,7 +17,8 @@ ReturnPageQuery returnPageQuery
         )
         {
             Id = admin.AdminAccount.Id;
-            Name = admin.SearchableName;
+            Name = string.IsNullOrWhiteSpace(admin.UserAccount.FirstName) ? admin.UserAccount.LastName :
+                    $"{admin.UserAccount.LastName}, {admin.UserAccount.FirstName}";
             CategoryName = admin.AdminAccount.CategoryName ?? "All";
             EmailAddress = admin.EmailForCentreNotifications;
             IsLocked = admin.UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ ReturnPageQuery returnPageQuery`
`17`	`17`	`)`
`18`	`18`	`{`
`19`	`19`	`Id = admin.AdminAccount.Id;`
`20`		`- Name = admin.SearchableName;`
	`20`	`+ Name = string.IsNullOrWhiteSpace(admin.UserAccount.FirstName) ? admin.UserAccount.LastName :`
	`21`	`+ $"{admin.UserAccount.LastName}, {admin.UserAccount.FirstName}";`
`21`	`22`	`CategoryName = admin.AdminAccount.CategoryName ?? "All";`
`22`	`23`	`EmailAddress = admin.EmailForCentreNotifications;`
`23`	`24`	`IsLocked = admin.UserAccount.FailedLoginCount >= AuthHelper.FailedLoginThreshold;`