Merge pull request #36 from drgrice1/conf-suggestions

Suggested clean up and minor issue fixes.

Author: Alex-Jordan

htdocs/js/CourseAdmin/restrict_select.js

@@ -1,31 +1,33 @@
 (() => {
 	const addOnConfSelect = document.getElementById('add_on_conf');
-	const addOnConfOptgroups = [...addOnConfSelect.querySelectorAll('optgroup')];
+	if (!addOnConfSelect) return;
+
+	const addOnConfOptgroups = addOnConfSelect.querySelectorAll('optgroup');
 
 	// Track previously selected options to identify the newly clicked option
 	let previousSelection = [];
 
-	addOnConfSelect.addEventListener('change', (event) => {
-		const currentSelection = Array.from(addOnConfSelect.selectedOptions);
-
+	addOnConfSelect.addEventListener('change', () => {
 		// Find the option the user just clicked/selected
-		const newlySelected = currentSelection.find((option) => !previousSelection.includes(option));
+		const newlySelected = Array.from(addOnConfSelect.selectedOptions).find(
+			(option) => !previousSelection.includes(option)
+		);
 
 		if (newlySelected) {
 			// Find the parent optgroup
 			const parent = newlySelected.closest('optgroup');
 
 			// Loop through all options in the other groups and unselect them as appropriate
-			addOnConfOptgroups.forEach((group) => {
-				Array.from(group.children).forEach((option) => {
+			for (const group of addOnConfOptgroups) {
+				for (const option of group.children) {
 					if (
 						option !== newlySelected &&
 						(parent.dataset.single || (!parent.dataset.single && group.dataset.single))
 					) {
 						option.selected = false;
 					}
-				});
-			});
+				}
+			}
 		}
 
 		// Update tracking variable for the next change event

lib/WeBWorK/Utils/CourseManagement.pm

@@ -1179,9 +1179,10 @@ sub protectQString {
 
 =item writeCourseConf($fh, $addOnConf)
 
-Writes an essentially empty course.conf file to $fh, a file handle. System
-administrators can use this file to override global settings for a course.
-$addOnConf should be an array reference of config files to tack on at the end.
+Writes the course.conf file to C<$fh>, a file handle. System administrators can
+use this file to override global settings for a course.  If C<$addOnConf> is
+provided, then it should be a reference to an array of config files to be
+included at the end of the course.conf file.
 
 =back
 
@@ -1197,12 +1198,9 @@ sub writeCourseConf {
 
 EOF
 
-	if ($addOnConf ne '') {
+	if (ref $addOnConf eq 'ARRAY') {
 		for my $conf (@$addOnConf) {
-			$content .= <<"EOF";
-
-include('$conf');
-EOF
+			$content .= "\ninclude('$conf');";
 		}
 	}
 

templates/ContentGenerator/CourseAdmin/add_course_form.html.ep

@@ -221,11 +221,10 @@
 				<%= maketext('course institution (will override "Institution" input above)') =%>
 			</label>
 		</div>
-		% my $addOnConfFolder = $ce->{webworkDirs}{addOnConf};
 		% my @addOnConfFiles;
-		% if (-d $addOnConfFolder) {
-			% @addOnConfFiles = glob "$addOnConfFolder/*.conf";
-			% for (0..$#addOnConfFiles){
+		% if (-d $ce->{webworkDirs}{addOnConf}) {
+			% @addOnConfFiles = glob "$ce->{webworkDirs}{addOnConf}/*.conf";
+			% for (0 .. $#addOnConfFiles){
 				% $addOnConfFiles[$_] =~ s/^.*\/|\.conf$//g;
 			% }
 		% }
@@ -236,17 +235,17 @@
 				<div class="col-auto">
 					<%= select_field add_on_conf => [
 							c(
-								maketext('Use Default')
-									=> [ [ maketext('Distribution Default Config File') => '' ] ],
-								'data-single' => 'true'
+								maketext('Default')
+									=> [ [ maketext('Use distribution default config file') => '', selected => undef ] ],
+								'data-single' => 'true',
 							),
 							c(
 								maketext('Source Course')
-									=> [ [ maketext("Source Course's Config File") => '*' ] ],
+									=> [ [ maketext("Use source course's config file") => '*' ] ],
 								'data-single' => 'true'
 							),
 							c(
-								maketext('Append to Distribution Default')
+								maketext('Append to distribution default')
 									=> [ map { [ $_ => "$_.conf" ] } @addOnConfFiles ]
 							)
 						],