diff --git a/src/Controllers/HomeController.cs b/src/Controllers/HomeController.cs index 4cab327..4578bfa 100644 --- a/src/Controllers/HomeController.cs +++ b/src/Controllers/HomeController.cs @@ -75,14 +75,7 @@ public class HomeController : Controller [Authorize(Roles = "CanManageUsers")] [HttpGet("Users")] - public async Task UsersAsync( - [FromQuery] int page = 1, - [FromQuery] int pageSize = 50, - [FromQuery] string? username = null, - [FromQuery] string? title = null, - [FromQuery] string? name = null, - [FromQuery] string? surname = null, - [FromQuery] string? workplace = null) + public async Task UsersAsync([FromQuery] int page = 1, [FromQuery] int pageSize = 50) { page = Math.Max(1, page); pageSize = Math.Clamp(pageSize, 10, 100); @@ -90,29 +83,6 @@ public class HomeController : Controller // Fetch all users with jpegPhoto (but not userPassword) IEnumerable allUsers = await _ldap.ListUsersAsync([.. _ldap.UsersAttributes.Where(attr => attr != "userPassword")]); List usersList = allUsers.ToList(); - - // Apply filters - if (!string.IsNullOrWhiteSpace(username)) - { - usersList = usersList.Where(u => u.Uid?.Contains(username, StringComparison.OrdinalIgnoreCase) == true).ToList(); - } - if (!string.IsNullOrWhiteSpace(title)) - { - usersList = usersList.Where(u => u.Title?.Contains(title, StringComparison.OrdinalIgnoreCase) == true).ToList(); - } - if (!string.IsNullOrWhiteSpace(name)) - { - usersList = usersList.Where(u => u.Cn?.Contains(name, StringComparison.OrdinalIgnoreCase) == true).ToList(); - } - if (!string.IsNullOrWhiteSpace(surname)) - { - usersList = usersList.Where(u => u.Sn?.Contains(surname, StringComparison.OrdinalIgnoreCase) == true).ToList(); - } - if (!string.IsNullOrWhiteSpace(workplace)) - { - usersList = usersList.Where(u => u.Description?.Workplace?.Contains(workplace, StringComparison.OrdinalIgnoreCase) == true).ToList(); - } - int totalUsers = usersList.Count; List paginatedUsers = usersList diff --git a/src/Views/Home/Users.cshtml b/src/Views/Home/Users.cshtml index e888447..b41b72f 100644 --- a/src/Views/Home/Users.cshtml +++ b/src/Views/Home/Users.cshtml @@ -19,7 +19,7 @@ -
+
@Model.TotalUsers @T["users"] @T["total"] @if (Model.TotalPages > 1) { @@ -28,40 +28,8 @@
- @* Filter Section *@ -
-
-
@T["Filter Users"]
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- - - -
+ +
@@ -74,7 +42,7 @@ - + @{ foreach (UserTableViewModel userTableViewModel in Model.UserTableViewModels) { @@ -129,224 +97,64 @@ @* Pagination Controls *@ - + + } - -
@T["Action"]