[WWcvs] webwork2: Using Mike's fix for bug #942, because it was nicer.

[Sam H. v. a. <we...@ma...>]

Log Message:
-----------
Using Mike's fix for bug #942, because it was nicer.

Tags:
----
rel-2-2-dev

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        UserList.pm

Revision Data
-------------
Index: UserList.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instr=
uctor/UserList.pm,v
retrieving revision 1.75.2.1
retrieving revision 1.75.2.2
diff -Llib/WeBWorK/ContentGenerator/Instructor/UserList.pm -Llib/WeBWorK/=
ContentGenerator/Instructor/UserList.pm -u -r1.75.2.1 -r1.75.2.2
--- lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -1327,23 +1327,17 @@
 			next;
 		}
 	=09
-		# make sure permission level is defined
-		if (not defined $record{permission}) {
-			$record{permission} =3D $default_permission_level;
-		}
-	=09
-		# make sure permission level is numeric
-		unless ($record{permission} =3D~ m/^[+\-]?\d*$/) {
-			$self->addbadmessage("permission level '$record{permission}' for user=
 '$user_id' is not an integer. using default permission level '$default_p=
ermission_level'.\n");
-			$record{permission} =3D $default_permission_level;
-		}
-	=09
 		my $User =3D $db->newUser(%record);
 		my $PermissionLevel =3D $db->newPermissionLevel(user_id =3D> $user_id,=
 permission =3D> 0);
 		my $Password =3D $db->newPassword(user_id =3D> $user_id, password =3D>=
 cryptPassword($record{student_id}));
 	=09
 		# use password and permission from record if there
 		if (exists $record{permission}) {
+			# make sure permission level is numeric
+			unless (defined($record{permission}) and $record{permission} =3D~ m/^=
[+\-]?\d*$/) {
+				$self->addbadmessage("permission level=CA for user '$user_id' is not=
 defined or is not an integer. Set the permission level to the default pe=
rmission level '$default_permission_level'.\n");
+				$record{permission} =3D $default_permission_level;
+			}
 			$PermissionLevel->permission($record{permission});
 		}
 	=09