Make sure that if the viewable_sections and viewable_recitations arrays

are not defined, then the or in the where clause in SendMail.pm is not
added.

Author: drgrice1

lib/WeBWorK/ContentGenerator/Instructor/UserDetail.pm

@@ -226,24 +226,6 @@ sub body {
 	);
 	my $userDetailUrl = $self->systemLink($userDetailPage, authen => 0);
 
-	my %GlobalSetRecords = map { $_->set_id => $_ } @{ $self->{setRecords} };
-	my %UserSetRecords =
-		map { $_->set_id => $_ } $db->getUserSetsWhere({ user_id => $editForUserID, set_id => { not_like => '%,v%' } });
-	my %MergedSetRecords = map { $_->set_id => $_ } $db->getMergedSetsWhere({ user_id => $editForUserID });
-
-	# get set versions of versioned sets
-	my %UserSetVersionRecords;
-	my %UserSetMergedVersionRecords;
-	foreach my $setid (keys(%UserSetRecords)) {
-		if ($GlobalSetRecords{$setid}->assignment_type =~ /gateway/) {
-			my @setVersionRefs = map { [ $editForUserID, $setid, $_ ] } $db->listSetVersions($editForUserID, $setid);
-			if (@setVersionRefs) {
-				$UserSetVersionRecords{$setid}       = [ $db->getSetVersions(@setVersionRefs) ];
-				$UserSetMergedVersionRecords{$setid} = [ $db->getMergedSetVersions(@setVersionRefs) ];
-			}
-		}
-	}
-
 	########################################
 	# Assigned sets form
 	########################################
@@ -295,27 +277,55 @@ sub body {
 	print CGI::Tr(CGI::th({ class => 'text-center', colspan => 3 }, "Sets assigned to $userName ($editForUserID)"));
 	print CGI::Tr(CGI::th({ class => 'text-center' }, [ 'Assigned', "Edit set for $editForUserID", 'Dates', ]));
 
+	my %GlobalSetRecords = map { $_->set_id => $_ } @{ $self->{setRecords} };
+	my %UserSetRecords =
+		map { $_->set_id => $_ } $db->getUserSetsWhere({ user_id => $editForUserID, set_id => { not_like => '%,v%' } });
+	my %MergedSetRecords = map { $_->set_id => $_ } $db->getMergedSetsWhere({ user_id => $editForUserID });
+
+	# get set versions of versioned sets
+	my %UserSetVersionRecords;
+	my %UserSetMergedVersionRecords;
+	foreach my $setid (keys(%UserSetRecords)) {
+		if ($GlobalSetRecords{$setid}->assignment_type =~ /gateway/) {
+			my @setVersionRefs = map { [ $editForUserID, $setid, $_ ] } $db->listSetVersions($editForUserID, $setid);
+			if (@setVersionRefs) {
+				$UserSetVersionRecords{$setid}       = [ $db->getSetVersions(@setVersionRefs) ];
+				$UserSetMergedVersionRecords{$setid} = [ $db->getMergedSetVersions(@setVersionRefs) ];
+			}
+		}
+	}
+
 	# Create a list of sets to show
-	my @setsToShow = map { $_->set_id } @{ $self->{setRecords} };
+	#my @setsToShow = map { $_->set_id } @{ $self->{setRecords} };
 
 	# insert any set versions that we have
-	if (@setsToShow) {
-		my $i = $#setsToShow;
-		if (defined($UserSetVersionRecords{ $setsToShow[$i] })) {
-			push(@setsToShow,
-				map { $_->set_id . ",v" . $_->version_id } @{ $UserSetVersionRecords{ $setsToShow[$i] } });
-		}
-		$i--;
-		while ($i >= 0) {
-			if (defined($UserSetVersionRecords{ $setsToShow[$i] })) {
-				splice(@setsToShow, $i + 1, 0,
-					map { $_->set_id . ",v" . $_->version_id } @{ $UserSetVersionRecords{ $setsToShow[$i] } });
+	#if (@setsToShow) {
+	#	my $i = $#setsToShow;
+	#	if (defined($UserSetVersionRecords{ $setsToShow[$i] })) {
+	#		push(@setsToShow,
+	#			map { $_->set_id . ",v" . $_->version_id } @{ $UserSetVersionRecords{ $setsToShow[$i] } });
+	#	}
+	#	$i--;
+	#	while ($i >= 0) {
+	#		if (defined($UserSetVersionRecords{ $setsToShow[$i] })) {
+	#			splice(@setsToShow, $i + 1, 0,
+	#				map { $_->set_id . ",v" . $_->version_id } @{ $UserSetVersionRecords{ $setsToShow[$i] } });
+	#		}
+	#		$i--;
+	#	}
+	#}
+
+	for my $set (@{ $self->{setRecords} }) {
+		my $setID = $set->set_id;
+
+		if (defined $UserSetVersionRecords{$setID}) {
+			for my $version (@{ $UserSetVersionRecords{$setID} }) {
+				my $setVersion = $version->version_id;
+				my $versionSetID = "$setID,v$setVersion";
+				warn $versionSetID;
 			}
-			$i--;
 		}
-	}
 
-	for my $setID (@setsToShow) {
 		# catch the versioned sets that we just added
 		my $setVersion = 0;
 		my $fullSetID  = $setID;
@@ -324,7 +334,7 @@ sub body {
 			$setID =~ s/,v\d+$//;
 		}
 
-		my $GlobalSetRecord = $GlobalSetRecords{$setID};
+		my $GlobalSetRecord = $set;
 		my $UserSetRecord =
 			(!$setVersion) ? $UserSetRecords{$setID} : $UserSetVersionRecords{$setID}->[ $setVersion - 1 ];
 		my $MergedSetRecord =
@@ -359,7 +369,7 @@ sub body {
 					labelattributes => { class => 'form-check-label' }
 				}),
 				defined($MergedSetRecord) ? CGI::b(CGI::a({ href => $url }, $setName)) : CGI::b($setID),
-				join "\n",
+				join "",
 				$self->DBFieldTable(
 					$GlobalSetRecord, $UserSetRecord, $MergedSetRecord, 'set',
 					$setID, \@dateFields, $rh_dateFieldLabels
@@ -387,6 +397,10 @@ sub body {
 	return '';
 }
 
+sub outputSetRow {
+	my $self = shift;
+}
+
 sub checkDates {
 	my $self         = shift;
 	my $setRecord    = shift;