From 12b17e672cab6c54f4c98c31054575fc884ae7b5 Mon Sep 17 00:00:00 2001 From: Mostafa Moafi Date: Wed, 1 May 2024 17:51:52 +0330 Subject: [PATCH 1/3] Fix #5994: Sorting (A-Z) members of roles in PersonaBar --- .../Dnn.PersonaBar.Extensions/Services/RolesController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs index 7f99f1e5117..541e9de06d9 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs @@ -246,11 +246,11 @@ public HttpResponseMessage GetRoleUsers(string keyword, int roleId, int pageInde Localization.GetString("InvalidRequest", Components.Constants.LocalResourcesFile)); } - var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName); + var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName).OrderBy(x => x.FullName).ToList(); if (!string.IsNullOrEmpty(keyword)) { users = - users.Where(u => u.FullName.StartsWith(keyword, StringComparison.OrdinalIgnoreCase)) + users.Where(u => u.FullName.StartsWith(keyword, StringComparison.OrdinalIgnoreCase)).OrderBy(x => x.FullName) .ToList(); } From 123e7b448a13a030941bbb88fb70201aa94cfd74 Mon Sep 17 00:00:00 2001 From: Mostafa Moafi Date: Wed, 1 May 2024 17:51:52 +0330 Subject: [PATCH 2/3] Fix #5994: Sorting (A-Z) members of roles in PersonaBar --- .../Dnn.PersonaBar.Extensions/Services/RolesController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs index 7f99f1e5117..73105719ffc 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs @@ -246,7 +246,7 @@ public HttpResponseMessage GetRoleUsers(string keyword, int roleId, int pageInde Localization.GetString("InvalidRequest", Components.Constants.LocalResourcesFile)); } - var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName); + var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName).ToList(); if (!string.IsNullOrEmpty(keyword)) { users = @@ -257,7 +257,7 @@ public HttpResponseMessage GetRoleUsers(string keyword, int roleId, int pageInde var totalRecords = users.Count; var startIndex = pageIndex * pageSize; var portal = PortalController.Instance.GetPortal(this.PortalId); - var pagedData = users.Skip(startIndex).Take(pageSize).Select(u => new UserRoleDto() + var pagedData = users.OrderBy(x => x.FullName).Skip(startIndex).Take(pageSize).Select(u => new UserRoleDto() { UserId = u.UserID, RoleId = u.RoleID, From 80908219968de0b080e623cd03349e23aa0a1e19 Mon Sep 17 00:00:00 2001 From: Brian Dukes Date: Wed, 1 May 2024 10:25:06 -0500 Subject: [PATCH 3/3] Update Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs --- .../Dnn.PersonaBar.Extensions/Services/RolesController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs index 73105719ffc..522991d2c48 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/RolesController.cs @@ -246,7 +246,7 @@ public HttpResponseMessage GetRoleUsers(string keyword, int roleId, int pageInde Localization.GetString("InvalidRequest", Components.Constants.LocalResourcesFile)); } - var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName).ToList(); + var users = RoleController.Instance.GetUserRoles(this.PortalId, Null.NullString, role.RoleName); if (!string.IsNullOrEmpty(keyword)) { users =