Log Message:
-----------
HEAD backport: new regexp matching can now match on permission level too
(toenail)
Tags:
----
rel-2-1-patches
Modified Files:
--------------
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
UserList.pm
Revision Data
-------------
Index: UserList.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/UserList.pm,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.2
diff -Llib/WeBWorK/ContentGenerator/Instructor/UserList.pm -Llib/WeBWorK/ContentGenerator/Instructor/UserList.pm -u -r1.60.2.1 -r1.60.2.2
--- lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/UserList.pm
@@ -622,6 +622,12 @@
my @userIDs;
foreach my $record (@userRecords) {
next unless $record;
+
+ # add permission level to user record hash so we can match it if necessary
+ if ($field eq "permission") {
+ my $permissionLevel = $db->getPermissionLevel($record->user_id);
+ $record->{permission} = $permissionLevel->permission;
+ }
push @userIDs, $record->user_id if $record->{$field} =~ /^$regex/i;
}
$self->{visibleUserIDs} = \@userIDs;
|
