version 1.97.2.4, 2010/01/20 17:41:25
|
version 1.97.2.5, 2010/01/20 18:22:35
|
Line 236 sub domain_roles_select {
|
Line 236 sub domain_roles_select {
|
# |
# |
# Role types |
# Role types |
my @roletypes = ('domain','author','course','community'); |
my @roletypes = ('domain','author','course','community'); |
|
|
my %lt = &role_type_names(); |
my %lt = &role_type_names(); |
# |
# |
# build up the menu information to be passed to |
# build up the menu information to be passed to |
Line 248 sub domain_roles_select {
|
Line 247 sub domain_roles_select {
|
foreach my $roletype (@roletypes) { |
foreach my $roletype (@roletypes) { |
# set up the text for this domain |
# set up the text for this domain |
$select_menus{$roletype}->{'text'}= $lt{$roletype}; |
$select_menus{$roletype}->{'text'}= $lt{$roletype}; |
|
my $crstype; |
|
if ($roletype eq 'community') { |
|
$crstype = 'Community'; |
|
} |
# we want a choice of 'default' as the default in the second menu |
# we want a choice of 'default' as the default in the second menu |
if ($env{'form.roletype'} ne '') { |
if ($env{'form.roletype'} ne '') { |
$select_menus{$roletype}->{'default'} = $env{'form.showrole'}; |
$select_menus{$roletype}->{'default'} = $env{'form.showrole'}; |
Line 272 sub domain_roles_select {
|
Line 275 sub domain_roles_select {
|
&mt('Custom role'); |
&mt('Custom role'); |
} else { |
} else { |
$select_menus{$roletype}->{'select2'}->{$role} = |
$select_menus{$roletype}->{'select2'}->{$role} = |
&Apache::lonnet::plaintext($role); |
&Apache::lonnet::plaintext($role,$crstype); |
} |
} |
} |
} |
$select_menus{$roletype}->{'select2'}->{'Any'} = &mt('Any'); |
$select_menus{$roletype}->{'select2'}->{'Any'} = &mt('Any'); |
Line 1291 sub domain_roles {
|
Line 1294 sub domain_roles {
|
|
|
sub course_roles { |
sub course_roles { |
my ($context,$checkpriv,$custom,$roletype) = @_; |
my ($context,$checkpriv,$custom,$roletype) = @_; |
my @allroles = &roles_by_context('course',$custom,$roletype); |
my $crstype; |
|
if ($roletype eq 'community') { |
|
$crstype = 'Community' ; |
|
} else { |
|
$crstype = 'Course'; |
|
} |
|
my @allroles = &roles_by_context('course',$custom,$crstype); |
my @roles; |
my @roles; |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
@roles = @allroles; |
@roles = @allroles; |
Line 1781 sub gather_userinfo {
|
Line 1790 sub gather_userinfo {
|
$indexhash,$uniqid,$userlist); |
$indexhash,$uniqid,$userlist); |
} |
} |
} |
} |
} elsif ($env{'form.roletype'} eq 'course') { |
} elsif (($env{'form.roletype'} eq 'course') || |
|
($env{'form.roletype'} eq 'community')) { |
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = |
($userdata{'username'},$userdata{'domain'},$userdata{'role'}) = |
split(/:/,$item); |
split(/:/,$item); |
if (ref($rolehash->{$item}) eq 'HASH') { |
if (ref($rolehash->{$item}) eq 'HASH') { |
Line 1831 sub gather_userinfo {
|
Line 1841 sub gather_userinfo {
|
sub build_user_record { |
sub build_user_record { |
my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_; |
my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_; |
next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1'); |
next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1'); |
if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) { |
if (!(($context eq 'domain') && (($env{'form.roletype'} eq 'course') |
|
&& ($env{'form.roletype'} eq 'community')))) { |
&process_date_info($userdata); |
&process_date_info($userdata); |
} |
} |
my $username = $userdata->{'username'}; |
my $username = $userdata->{'username'}; |
Line 2134 function photowindow(photolink) {
|
Line 2145 function photowindow(photolink) {
|
<input type="hidden" name="displayclickers" value="$displayclickers" /> |
<input type="hidden" name="displayclickers" value="$displayclickers" /> |
END |
END |
} |
} |
|
} elsif ($context eq 'domain') { |
|
if ($setting eq 'community') { |
|
$crstype = 'Community'; |
|
} elsif ($crstype eq 'course') { |
|
$crstype = 'Course'; |
|
} |
} |
} |
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') { |
if ($mode ne 'autoenroll' && $mode ne 'pickauthor') { |
my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); |
my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); |
Line 2230 END
|
Line 2247 END
|
); |
); |
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { |
if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { |
$lt{'extent'} = &mt('Course(s): description, section(s), status'); |
$lt{'extent'} = &mt('Course(s): description, section(s), status'); |
|
} elsif ($context eq 'domain' && $env{'form.roletype'} eq 'community') { |
|
$lt{'extent'} = &mt('Communities: description, section(s), status'); |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$lt{'extent'} = &mt('Author'); |
$lt{'extent'} = &mt('Author'); |
} |
} |
Line 2241 END
|
Line 2260 END
|
if ($context eq 'course') { |
if ($context eq 'course') { |
push(@cols,'section'); |
push(@cols,'section'); |
} |
} |
if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { |
if (!($context eq 'domain' && ($env{'form.roletype'} eq 'course') |
|
&& ($env{'form.roletype'} eq 'community'))) { |
push(@cols,('start','end')); |
push(@cols,('start','end')); |
} |
} |
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') { |
if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') { |
push(@cols,'role'); |
push(@cols,'role'); |
} |
} |
if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' || |
if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' || |
$env{'form.roletype'} eq 'course')) { |
$env{'form.roletype'} eq 'course' || |
|
$env{'form.roletype'} eq 'community')) { |
push (@cols,'extent'); |
push (@cols,'extent'); |
} |
} |
if (($statusmode eq 'Any') && |
if (($statusmode eq 'Any') && |
(!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) { |
(!($context eq 'domain' && (($env{'form.roletype'} eq 'course') |
|
|| ($env{'form.roletype'} eq 'community'))))) { |
push(@cols,'status'); |
push(@cols,'status'); |
} |
} |
if ($context eq 'course') { |
if ($context eq 'course') { |
Line 2270 END
|
Line 2292 END
|
my $results_description; |
my $results_description; |
if ($mode ne 'autoenroll') { |
if ($mode ne 'autoenroll') { |
$results_description = &results_header_row($rolefilter,$statusmode, |
$results_description = &results_header_row($rolefilter,$statusmode, |
$context,$permission,$mode); |
$context,$permission,$mode,$crstype); |
|
|
$r->print('<b>'.$results_description.'</b><br /><br />'); |
$r->print('<b>'.$results_description.'</b><br /><br />'); |
} |
} |
my ($output,$actionselect,%canchange,%canchangesec); |
my ($output,$actionselect,%canchange,%canchangesec); |
Line 2505 END
|
Line 2528 END
|
} |
} |
} elsif ($env{'form.roletype'} eq 'author') { |
} elsif ($env{'form.roletype'} eq 'author') { |
($uname,$udom,$role) = split(/:/,$user,-1); |
($uname,$udom,$role) = split(/:/,$user,-1); |
} elsif ($env{'form.roletype'} eq 'course') { |
} elsif (($env{'form.roletype'} eq 'course') || |
|
($env{'form.roletype'} eq 'community')) { |
($uname,$udom,$role) = split(/:/,$user); |
($uname,$udom,$role) = split(/:/,$user); |
} |
} |
} else { |
} else { |
Line 3219 sub section_picker {
|
Line 3243 sub section_picker {
|
} |
} |
|
|
sub results_header_row { |
sub results_header_row { |
my ($rolefilter,$statusmode,$context,$permission,$mode) = @_; |
my ($rolefilter,$statusmode,$context,$permission,$mode,$crstype) = @_; |
my ($description,$showfilter); |
my ($description,$showfilter); |
if ($rolefilter ne 'Any') { |
if ($rolefilter ne 'Any') { |
$showfilter = $rolefilter; |
$showfilter = $rolefilter; |
} |
} |
if ($context eq 'course') { |
if ($context eq 'course') { |
if ($mode eq 'csv' || $mode eq 'excel') { |
if ($mode eq 'csv' || $mode eq 'excel') { |
$description = &mt('Course - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' '; |
if ($crstype eq 'Community') { |
|
$description = &mt('Community - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' '; |
|
} else { |
|
$description = &mt('Course - [_1]:',$env{'course.'.$env{'request.course.id'}.'.description'}).' '; |
|
} |
} |
} |
if ($statusmode eq 'Expired') { |
if ($statusmode eq 'Expired') { |
$description .= &mt('Users in course with expired [_1] roles',$showfilter); |
if ($crstype eq 'Community') { |
|
$description .= &mt('Users in community with expired [_1] roles',$showfilter); |
|
} else { |
|
$description .= &mt('Users in course with expired [_1] roles',$showfilter); |
|
} |
} elsif ($statusmode eq 'Future') { |
} elsif ($statusmode eq 'Future') { |
$description .= &mt('Users in course with future [_1] roles',$showfilter); |
if ($crstype eq 'Community') { |
|
$description .= &mt('Users in community with future [_1] roles',$showfilter); |
|
} else { |
|
$description .= &mt('Users in course with future [_1] roles',$showfilter); |
|
} |
} elsif ($statusmode eq 'Active') { |
} elsif ($statusmode eq 'Active') { |
$description .= &mt('Users in course with active [_1] roles',$showfilter); |
if ($crstype eq 'Community') { |
|
$description .= &mt('Users in community with active [_1] roles',$showfilter); |
|
} else { |
|
$description .= &mt('Users in course with active [_1] roles',$showfilter); |
|
} |
} else { |
} else { |
if ($rolefilter eq 'Any') { |
if ($rolefilter eq 'Any') { |
$description .= &mt('All users in course'); |
if ($crstype eq 'Community') { |
|
$description .= &mt('All users in community'); |
|
} else { |
|
$description .= &mt('All users in course'); |
|
} |
} else { |
} else { |
$description .= &mt('All users in course with [_1] roles',$rolefilter); |
if ($crstype eq 'Community') { |
|
$description .= &mt('All users in community with [_1] roles',$rolefilter); |
|
} else { |
|
$description .= &mt('All users in course with [_1] roles',$rolefilter); |
|
} |
} |
} |
} |
} |
my $constraint; |
my $constraint; |
Line 3334 sub results_header_row {
|
Line 3382 sub results_header_row {
|
$description .= &mt('All co-authors in domain with [_1] roles',$rolefilter); |
$description .= &mt('All co-authors in domain with [_1] roles',$rolefilter); |
} |
} |
} |
} |
} elsif ($env{'form.roletype'} eq 'course') { |
} elsif (($env{'form.roletype'} eq 'course') || |
|
($env{'form.roletype'} eq 'community')) { |
|
|
my $coursefilter = $env{'form.coursepick'}; |
my $coursefilter = $env{'form.coursepick'}; |
if ($coursefilter eq 'category') { |
if ($env{'form.roletype'} eq 'course') { |
my $instcode = &instcode_from_coursefilter(); |
if ($coursefilter eq 'category') { |
if ($instcode eq '.') { |
my $instcode = &instcode_from_coursefilter(); |
|
if ($instcode eq '.') { |
|
$description .= &mt('All courses in domain').' - '; |
|
} else { |
|
$description .= &mt('Courses in domain with institutional code: [_1]',$instcode).' - '; |
|
} |
|
} elsif ($coursefilter eq 'selected') { |
|
$description .= &mt('Selected courses in domain').' - '; |
|
} elsif ($coursefilter eq 'all') { |
$description .= &mt('All courses in domain').' - '; |
$description .= &mt('All courses in domain').' - '; |
} else { |
|
$description .= &mt('Courses in domain with institutional code: [_1]',$instcode).' - '; |
|
} |
} |
} elsif ($coursefilter eq 'selected') { |
} elsif ($env{'form.roletype'} eq 'community') { |
$description .= &mt('Selected courses in domain').' - '; |
if ($coursefilter eq 'selected') { |
} elsif ($coursefilter eq 'all') { |
$description .= &mt('Selected communities in domain').' - '; |
$description .= &mt('All courses in domain').' - '; |
} elsif ($coursefilter eq 'all') { |
|
$description .= &mt('All communities in domain').' - '; |
|
} |
} |
} |
if ($statusmode eq 'Expired') { |
if ($statusmode eq 'Expired') { |
$description .= &mt('users with expired [_1] roles',$showfilter); |
$description .= &mt('users with expired [_1] roles',$showfilter); |
Line 3751 sub upfile_drop_add {
|
Line 3809 sub upfile_drop_add {
|
} |
} |
my (%userlist,%modifiable_fields,@poss_roles); |
my (%userlist,%modifiable_fields,@poss_roles); |
my $secidx = &Apache::loncoursedata::CL_SECTION(); |
my $secidx = &Apache::loncoursedata::CL_SECTION(); |
my @courseroles = &roles_by_context('course',1,'',$crstype); |
my @courseroles = &roles_by_context('course',1,$crstype); |
if (!&Apache::lonnet::allowed('mau',$domain)) { |
if (!&Apache::lonnet::allowed('mau',$domain)) { |
if ($context eq 'course' || $context eq 'author') { |
if ($context eq 'course' || $context eq 'author') { |
@poss_roles = &curr_role_permissions($context,'','',$crstype); |
@poss_roles = &curr_role_permissions($context,'','',$crstype); |