Skip to content

Commit e81c061

Browse files
authored
Merge pull request #1151 from hargata/Hargata/565
fixed order.
2 parents 0f2a7c3 + 0aae215 commit e81c061

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Controllers/AdminController.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ public IActionResult UpdateUserAdminStatus(int userId, bool isAdmin)
8989
public IActionResult GetUserHouseholdModal(int userId)
9090
{
9191
var households = _userLogic.GetHouseholdForParentUserId(userId);
92+
if (households.Any())
93+
{
94+
households = households.OrderBy(x => x.UserName).ToList();
95+
}
9296
var viewModel = new UserHouseholdAdminViewModel { Households = households, ParentUserId = userId };
9397
return PartialView("_AdminUserHouseholdModal", viewModel);
9498
}

Controllers/HomeController.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ public IActionResult GetUserAccountInformationModal()
293293
public IActionResult GetHouseholdModal()
294294
{
295295
var households = _userLogic.GetHouseholdForParentUserId(GetUserID());
296+
if (households.Any())
297+
{
298+
households = households.OrderBy(x => x.UserName).ToList();
299+
}
296300
return PartialView("_UserHouseholdModal", households);
297301
}
298302
[HttpPost]

0 commit comments

Comments
 (0)