only sort visibleUsers

openwebwork · Feb 19, 2023 · 02b0895 · 02b0895
1 parent 0cb2413
commit 02b0895
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm b/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -241,7 +241,8 @@ sub pre_header_initialize ($c) {
 	$c->{allUserIDs}    = [ keys %allUsers ];
 	$c->{sortedUserIDs} = [
 		map  { $_->user_id }
-		sort { &$primarySortSub || &$secondarySortSub || &$ternarySortSub } (values %allUsers)
+		sort { &$primarySortSub || &$secondarySortSub || &$ternarySortSub }
+		grep { $c->{visibleUserIDs}{ $_->user_id } } (values %allUsers)
 	];
 
 	return;

diff --git a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
@@ -69,7 +69,7 @@
 			</tr>
 		</thead>
 		<tbody class="table-group-divider">
-			% for (grep { $c->{visibleUserIDs}{$_} } @{ $c->{sortedUserIDs} }) {
+			% for (@{ $c->{sortedUserIDs} }) {
 				<%= include 'ContentGenerator/Instructor/UserList/user_row',
 					user => $c->{allUsers}{$_}, userSelected => exists $c->{selectedUserIDs}{$_}, editable => exists $c->{userIsEditable}{$_} =%>
 			% }
@@ -78,7 +78,7 @@
 </div>
 %
 % # If there are no users shown print message.
-% unless (scalar(keys %{ $c->{visibleUserIDs} })) {
+% unless (scalar(@{ $c->{sortedUserIDs} })) {
 	<p>
 		<i>
 			<%= maketext('No students shown. Choose one of the options above to list the students in the course.') =%>