Skip to content

Speed up loading of the "Users Assigned to Set" page. #2714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: WeBWorK-2.20
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions lib/WeBWorK/ContentGenerator/Instructor/UsersAssignedToSet.pm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ sub initialize ($c) {
my $setID = $c->stash('setID');
my $user = $c->param('user');

# Make sure these are defined for the template.
$c->stash->{user_records} = [];
$c->stash->{set_records} = {};

# Check permissions
return unless $authz->hasPermissions($user, "access_instructor_tools");
return unless $authz->hasPermissions($user, "assign_problem_sets");
Expand Down Expand Up @@ -62,7 +66,7 @@ sub initialize ($c) {
}

# Get all user records and cache them for later use.
$c->{user_records} =
$c->stash->{user_records} =
[ $db->getUsersWhere({ user_id => { not_like => 'set_id:%' } }, [qw/section last_name first_name/]) ];

if ($doAssignToSelected) {
Expand All @@ -71,7 +75,7 @@ sub initialize ($c) {

my %setUsers = map { $_ => 1 } $db->listSetUsers($setID);
my @usersToAdd;
for my $selectedUser (map { $_->user_id } @{ $c->{user_records} }) {
for my $selectedUser (map { $_->user_id } @{ $c->stash->{user_records} }) {
if (exists $selectedUsers{$selectedUser}) {
unless ($setUsers{$selectedUser}) { # skip users already in the set
debug("saving $selectedUser to be added to set later");
Expand All @@ -89,6 +93,8 @@ sub initialize ($c) {
}
}

$c->stash->{set_records} = { map { $_->user_id => $_ } $db->getUserSetsWhere({ set_id => $setID }) };

return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
</tr>
</thead>
<tbody class="table-group-divider">
% for my $user (@{ $c->{user_records} }) {
% for my $user (@$user_records) {
% my $userID = $user->user_id;
% my $userSet = $db->getUserSet($userID, $setID);
% my $userSet = $set_records->{$userID};
%
<tr>
<td class="text-center">
Expand Down