Offer an option to fix directories and links when renaming a course.

Also fix the logic both here and when archiving a course for the
possible combinations of the directories, links, and database needing
repair.  With the previous logic if the directories were good, but the
database tables and links both needed repair, then the button said
"Attempt to upgrade directories and links".  However, in actuality if
that button were used, the server would both repair links and repair
database tables.  Now, anytime the database tables need repair the
button says "Upgrade Course Tables" regardless of the state of the
directories and links. This is not ideal since directories or links
might also be repaired in this case, but the important thing to show is
the database repair which is more important than directories and vastly
more important than links.

Author: drgrice1

lib/WeBWorK/ContentGenerator/CourseAdmin.pm

@@ -532,7 +532,9 @@ sub rename_course_confirm ($c) {
 		($tables_ok, $dbStatus) = $CIchecker->checkCourseTables($rename_oldCourseID);
 	}
 
-	# Check directories and links
+	# Update and check directories and links.
+	my $dir_update_messages  = $c->param('upgrade_course_tables') ? updateCourseDirectories($ce2) : [];
+	my $link_update_messages = $c->param('upgrade_course_tables') ? updateCourseLinks($ce2)       : [];
 	my ($directories_ok, $directory_report) = checkCourseDirectories($ce2);
 	my ($links_ok,       $link_report)      = checkCourseLinks($ce2);
 
@@ -543,8 +545,10 @@ sub rename_course_confirm ($c) {
 		dbStatus                      => $dbStatus,
 		directory_report              => $directory_report,
 		directories_ok                => $directories_ok,
+		dir_update_messages           => $dir_update_messages,
 		link_report                   => $link_report,
 		links_ok                      => $links_ok,
+		link_update_messages          => $link_update_messages,
 		rename_oldCourseTitle         => $rename_oldCourseTitle,
 		change_course_title_str       => $change_course_title_str,
 		rename_oldCourseInstitution   => $rename_oldCourseInstitution,

templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep

@@ -134,21 +134,18 @@
 			% }
 			<%= submit_button maketext('Archive'), name => 'confirm_archive_course', class => 'btn btn-primary' =%>
 		</div>
-	% } elsif ($directories_ok && $links_ok) {
-		<div class="d-flex justify-content-center gap-2">
-			<%= submit_button maketext(q{Don't Archive}),
-				name => 'decline_archive_course', class => 'btn btn-primary' =%>
-			<%= submit_button maketext('Upgrade Course Tables'),
-				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
-		</div>
 	% } else {
-		<div class="text-center alert alert-danger p-1 mb-2">
-			<%= maketext('Directory and/or link structure needs to be repaired manually before archiving.') =%>
-		</div>
+		% if (!$directories_ok || !$links_ok) {
+			<div class="text-center alert alert-danger p-1 mb-2">
+				<%= maketext('Directory and/or link structure needs to be repaired manually before archiving.') =%>
+			</div>
+		% }
 		<div class="d-flex justify-content-center gap-2">
 			<%= submit_button maketext(q{Don't Archive}),
 				name => 'decline_archive_course', class => 'btn btn-primary' =%>
-			<%= submit_button maketext('Attempt to upgrade directories and links'),
+			<%= submit_button $all_tables_ok
+					? maketext('Attempt to upgrade directories and links')
+					: maketext('Upgrade Course Tables'),
 				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
 		</div>
 	% }

templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep

@@ -62,6 +62,11 @@
 		<li><%= $_->[0] %>: <span class="<%= $_->[2] ? 'text-success' : 'text-danger' %>"><%= $_->[1] %></span></li>
 	% }
 </ul>
+<ul>
+	% for (@$dir_update_messages) {
+		<li><span class="<%= $_->[1] ? 'text-success' : 'text-danger' %>"><%= $_->[0] %></span></li>
+	% }
+</ul>
 % if ($directories_ok) {
 	<p class="text-success"><%= maketext('Directory structure is ok') %></p>
 % } else {
@@ -76,6 +81,11 @@
 		<li><%= $_->[0] %>: <span class="<%= $_->[3] ? 'text-success' : 'text-danger' %>"><%= $_->[2] %></span></li>
 	% }
 </ul>
+<ul>
+	% for (@$link_update_messages) {
+		<li><span class="<%= $_->[1] ? 'text-success' : 'text-danger' %>"><%= $_->[0] %></span></li>
+	% }
+</ul>
 % if ($links_ok) {
 	<p class="text-success"><%= maketext('Link structure is ok') %></p>
 % } else {
@@ -106,24 +116,25 @@
 				<div class="mb-3"><%= $change_course_institution_str %></div>
 			% }
 			<div class="d-flex justify-content-center gap-2">
-				<%= submit_button maketext(q{Don't rename}),
+				<%= submit_button maketext(q{Don't Rename}),
 					name => 'decline_rename_course', class => 'btn btn-primary' =%>
 				<%= submit_button maketext('Rename'),
 					name => 'confirm_rename_course', class => 'btn btn-primary' =%>
 			</div>
 		</div>
-	% } elsif ($directories_ok && $links_ok) {
+	% } else {
+		% if (!$directories_ok || !$links_ok) {
+			<div class="text-center alert alert-danger p-1 mb-2">
+				<%= maketext('Directory and/or link structure needs to be repaired manually before archiving.') =%>
+			</div>
+		% }
 		<div class="d-flex justify-content-center gap-2">
-			<%= submit_button maketext(q{Don't rename}), name => 'decline_rename_course', class => 'btn btn-primary' =%>
-			<%= submit_button maketext('Upgrade Course Tables'),
+			<%= submit_button maketext(q{Don't Rename}),
+				name => 'decline_rename_course', class => 'btn btn-primary' =%>
+			<%= submit_button $all_tables_ok
+					? maketext('Attempt to upgrade directories and links')
+					: maketext('Upgrade Course Tables'),
 				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
 		</div>
-	% } else {
-		<div class="text-center alert alert-danger p-1 mb-2">
-			<%= maketext('Directory and/or link structure needs to be repaired manually before renaming.') =%>
-		</div>
-		<div class="text-center">
-			<%= submit_button maketext(q{Don't rename}), name => 'decline_rename_course', class => 'btn btn-primary' =%>
-		</div>
 	% }
 <% end =%>