Skip to content

Commit 698ac7b

Browse files
committed
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
2 parents 31427b8 + d16c1ba commit 698ac7b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Delegates/GroupDelegatesController.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,13 @@ public IActionResult SelectDelegateAllItems(int groupId)
158158
var jobGroups = jobGroupsService.GetJobGroupsAlphabetical();
159159
var customPrompts = promptsService.GetCentreRegistrationPrompts(centreId);
160160
var delegateUsers = userService.GetDelegatesNotRegisteredForGroupByGroupId(groupId, centreId);
161-
161+
var groups = groupsService.GetActiveGroups(centreId);
162162
var model = new SelectDelegateAllItemsViewModel(
163163
delegateUsers,
164164
jobGroups,
165165
customPrompts,
166-
groupId
166+
groupId,
167+
groups
167168
);
168169

169170
return View(model);

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/GroupDelegates/SelectDelegateAllItemsViewModel.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ public SelectDelegateAllItemsViewModel(
1111
IEnumerable<DelegateUserCard> delegateUserCards,
1212
IEnumerable<(int id, string name)> jobGroups,
1313
IEnumerable<CentreRegistrationPrompt> customPrompts,
14-
int groupId
14+
int groupId,
15+
IEnumerable<(int id, string name)> groups
1516
)
16-
: base(delegateUserCards, jobGroups, customPrompts)
17+
: base(delegateUserCards, jobGroups, customPrompts, groups)
1718
{
1819
GroupId = groupId;
1920
}

0 commit comments

Comments
 (0)