Only show the archive file name for archive files that contain duplicate course ids.

Author: drgrice1

lib/WeBWorK/Utils/CourseManagement.pm

@@ -123,6 +123,9 @@ containing the C<courseID>, file C<size>, and C<lastModified> time. For example,
         }
     }
 
+Note that archive files that contain the same C<courseID> will also have the
+C<duplicateCourseID> key set to 1.
+
 =cut
 
 sub listArchivedCourses {
@@ -135,6 +138,7 @@ sub listArchivedCourses {
 	my $archiveDataFile = $archivesDir->child('archive-cache.json');
 	my $archiveData     = eval { decode_json($archiveDataFile->slurp) } || {};
 
+	my %seenCourseIDs;
 	my %updatedArchiveData;
 	my %return;
 	for (@$archives) {
@@ -143,7 +147,16 @@ sub listArchivedCourses {
 
 		if ($archiveData->{$basename} && $archiveData->{$basename}{lastModified} >= $lastModified) {
 			$updatedArchiveData{$basename} = $archiveData->{$basename};
-			$return{$basename} = $updatedArchiveData{$basename} if defined $archiveData->{$basename}{courseID};
+			if (defined $archiveData->{$basename}{courseID}) {
+				$return{$basename} = { %{ $updatedArchiveData{$basename} } };
+
+				if ($seenCourseIDs{ $updatedArchiveData{$basename}{courseID} }) {
+					$return{$basename}{duplicateCourseID} = 1;
+					$return{ $seenCourseIDs{ $updatedArchiveData{$basename}{courseID} } }{duplicateCourseID} = 1;
+				} else {
+					$seenCourseIDs{ $updatedArchiveData{$basename}{courseID} } = $basename;
+				}
+			}
 			next;
 		}
 
@@ -163,7 +176,14 @@ sub listArchivedCourses {
 
 		$updatedArchiveData{$basename}{courseID} = $currCourseID;
 		$updatedArchiveData{$basename}{size}     = getHumanReadableFileSize($_);
-		$return{$basename}                       = $updatedArchiveData{$basename};
+		$return{$basename}                       = { %{ $updatedArchiveData{$basename} } };
+
+		if ($seenCourseIDs{ $updatedArchiveData{$basename}{courseID} }) {
+			$return{$basename}{duplicateCourseID} = 1;
+			$return{ $seenCourseIDs{ $updatedArchiveData{$basename}{courseID} } }{duplicateCourseID} = 1;
+		} else {
+			$seenCourseIDs{ $updatedArchiveData{$basename}{courseID} } = $basename;
+		}
 	}
 
 	$archiveDataFile->spew(encode_json(\%updatedArchiveData));

templates/ContentGenerator/CourseAdmin.html.ep

@@ -67,7 +67,11 @@
 	<ol>
 		% my %courseArchives = listArchivedCourses($ce);
 		% for (sort { lc($a) cmp lc($b) } keys %courseArchives) {
-			<li><%= "$courseArchives{$_}{courseID} ($_, $courseArchives{$_}{size})" %></li>
+			<li>
+				<%= "$courseArchives{$_}{courseID} ("
+					. ($courseArchives{$_}{duplicateCourseID} ? "$_, " : "")
+					. "$courseArchives{$_}{size})" %>
+			</li>
 		% }
 	</ol>
 % }

templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep

@@ -19,9 +19,11 @@
 					class => 'col-md-2 pe-0 col-form-label fw-bold' =%>
 				<div class="col-lg-9 col-md-8">
 					<%= select_field
-						unarchive_courseID =>
-						[ map { [ "$courseArchives{$_}{courseID} ($_, $courseArchives{$_}{size})" => $_ ] }
-							@archiveFiles ],
+						unarchive_courseID => [
+							map { [ "$courseArchives{$_}{courseID} ("
+								. ($courseArchives{$_}{duplicateCourseID} ? "$_, " : "")
+								. "$courseArchives{$_}{size})" => $_ ] } @archiveFiles
+						],
 						id    => 'unarchive_courseID',
 						class => 'form-select',
 						size  => 10