[WWcvs] webwork2: syning with head

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
syning with head

Tags:
----
rel-2-4-patches

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        CourseAdmin.pm

Revision Data
-------------
Index: CourseAdmin.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm,v
retrieving revision 1.64.2.2.2.4
retrieving revision 1.64.2.2.2.5
diff -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -u -r1.64.2.2.2.4 -r1.64.2.2.2.5
--- lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -376,6 +376,7 @@
 		my @courseIDs = listCourses($ce);
 		foreach my $courseID (sort {lc($a) cmp lc($b) } @courseIDs) {
 			next if $courseID eq "admin"; # done already above
+			next if $courseID eq "modelCourse"; # modelCourse isn't a real course so don't create missing directories, etc
 			my $urlpath = $r->urlpath->newFromModule("WeBWorK::ContentGenerator::ProblemSets", courseID => $courseID);
 			my $tempCE = new WeBWorK::CourseEnvironment({
 				%WeBWorK::SeedCE,
@@ -390,8 +391,8 @@
 				CGI::code(
 					$tempCE->{dbLayoutName},
 				),
-				($courseID eq "modelCourse" or $directories_ok) ? "" : CGI::span({style=>"color:red"},"Directory structure or permissions need to be repaired. "),
-				($courseID eq "modelCourse" or $tables_ok  ) ? CGI::span({style=>"color:green"},"Database tables ok") : CGI::span({style=>"color:red"},"Database tables need updating."),
+				$directories_ok ? "" : CGI::span({style=>"color:red"},"Directory structure or permissions need to be repaired. "),
+				$tables_ok ? CGI::span({style=>"color:green"},"Database tables ok") : CGI::span({style=>"color:red"},"Database tables need updating."),
 			
 			);