--- loncom/interface/lonmodifycourse.pm 2016/04/04 01:09:48 1.81
+++ loncom/interface/lonmodifycourse.pm 2016/10/27 21:01:01 1.87
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.81 2016/04/04 01:09:48 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.87 2016/10/27 21:01:01 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -41,10 +41,11 @@ use LONCAPA qw(:DEFAULT :match);
sub get_dc_settable {
my ($type,$cdom) = @_;
- if (($type eq 'Community') || ($type eq 'Placement')) {
+ if ($type eq 'Community') {
return ('courseowner','selfenrollmgrdc','selfenrollmgrcc');
} else {
- my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc','selfenrollmgrcc');
+ my @items = ('courseowner','coursecode','authtype','autharg','selfenrollmgrdc',
+ 'selfenrollmgrcc','mysqltables');
if (&showcredits($cdom)) {
push(@items,'defaultcredits');
}
@@ -55,7 +56,7 @@ sub get_dc_settable {
sub autoenroll_keys {
my $internals = ['coursecode','courseowner','authtype','autharg','defaultcredits',
'autoadds','autodrops','autostart','autoend','sectionnums',
- 'crosslistings','co-owners'];
+ 'crosslistings','co-owners','autodropfailsafe'];
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date'];
return ($internals,$accessdates);
}
@@ -124,14 +125,13 @@ sub get_enrollment_settings {
$enrollvar{$type} =~ s/,/, /g;
} elsif ($type eq "authtype"
|| $type eq "autharg" || $type eq "coursecode"
- || $type eq "crosslistings") {
+ || $type eq "crosslistings" || $type eq "selfenrollmgr"
+ || $type eq "autodropfailsafe") {
$enrollvar{$type} = $settings{$item};
} elsif ($type eq 'defaultcredits') {
if (&showcredits($cdom)) {
$enrollvar{$type} = $settings{$item};
}
- } elsif ($type eq 'selfenrollmgr') {
- $enrollvar{$type} = $settings{$item};
} elsif ($type eq 'courseowner') {
if ($settings{$item} =~ /^[^:]+:[^:]+$/) {
$enrollvar{$type} = $settings{$item};
@@ -182,22 +182,65 @@ sub print_course_search_page {
$r->print(&Apache::loncommon::build_filters($filterlist,$type,undef,undef,$filter,$action,
\$numtitles,'modifycourse',undef,undef,undef,
\@codetitles,$dom));
+
+ my ($actiontext,$roleoption,$settingsoption);
if ($type eq 'Community') {
- $r->print(&mt('Actions available after searching for a community:').'
'.
- '
'.&mt('Enter the community with the role of [_1]',$cctitle).'
'."\n".
- '
'.&mt('View or modify community settings which only a [_1] may modify.',$dctitle).
- '
'."\n".'
');
+ $actiontext = &mt('Actions available after searching for a community:');
} elsif ($type eq 'Placement') {
- $r->print(&mt('Actions available after searching for a placement test:').'
'.
- '
'.&mt('Enter the placement test with the role of [_1]',$cctitle).'
'."\n".
- '
'.&mt('View or modify placement test settings which only a [_1] may modify.',$dctitle).
- '
'."\n".'
');
- } else {
- $r->print(&mt('Actions available after searching for a course:').'
'.
- '
'.&mt('Enter the course with the role of [_1]',$cctitle).'
'."\n".
- '
'.&mt('View or modify course settings which only a [_1] may modify.',$dctitle).
- '
'."\n".'
');
+ $actiontext = &mt('Actions available after searching for a placement test:')
+ } else {
+ $actiontext = &mt('Actions available after searching for a course:');
+ }
+ if (&Apache::lonnet::allowed('ccc',$dom)) {
+ if ($type eq 'Community') {
+ $roleoption = &mt('Enter the community with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify placement test settings which only a [_1] may modify.',$dctitle);
+ } else {
+ $roleoption = &mt('Enter the course with the role of [_1]',$cctitle);
+ $settingsoption = &mt('View or modify course settings which only a [_1] may modify.',$dctitle);
+ }
+ } elsif (&Apache::lonnet::allowed('rar',$dom)) {
+ my %adhocroles = &Apache::lonnet::userenvironment($env{'user.domain'},$env{'user.name'},
+ 'adhocroles.'.$dom);
+ if (keys(%adhocroles)) {
+ my @adhoc = split(',',$adhocroles{'adhocroles.'.$dom});
+ if (@adhoc > 1) {
+ if ($type eq 'Community') {
+ $roleoption = &mt('Enter the community with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
+ } else {
+ $roleoption = &mt('Enter the course with one of the available ad hoc roles: [_1].',
+ join(', ',@adhoc));
+ }
+ } else {
+ if ($type eq 'Community') {
+ $roleoption = &mt('Enter the community with the ad hoc role of: [_1]',$adhoc[0]);
+ } elsif ($type eq 'Placement') {
+ $roleoption = &mt('Enter the placement test with the ad hoc role of: [_1]',$adhoc[0]);
+ } else {
+ $roleoption = &mt('Enter the course with the ad hoc role of: [_1]',$adhoc[0]);
+ }
+ }
+ }
+ if ($type eq 'Community') {
+ $settingsoption = &mt('View community settings which only a [_1] may modify.',$dctitle);
+ } elsif ($type eq 'Placement') {
+ $settingsoption = &mt('View placement test settings which only a [_1] may modify.',$dctitle);
+ } else {
+ $settingsoption = &mt('View course settings which only a [_1] may modify.',$dctitle);
+ }
}
+ $r->print($actiontext.'
');
+ if ($roleoption) {
+ $r->print('
'.$roleoption.'
'."\n");
+ }
+ $r->print('
'.$settingsoption.'
'."\n".'
');
return;
}
@@ -222,7 +265,7 @@ sub print_course_selection_page {
my %courses = &Apache::loncommon::search_courses($dom,$type,$filter,$numtitles,
undef,undef,undef,\@codetitles);
&Apache::lonpickcourse::display_matched_courses($r,$type,0,$action,undef,undef,undef,
- undef,undef,%courses);
+ $dom,undef,%courses);
return;
}
@@ -243,7 +286,7 @@ sub get_filters {
}
sub print_modification_menu {
- my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash) = @_;
+ my ($r,$cdesc,$domdesc,$dom,$type,$cid,$coursehash,$permission) = @_;
&print_header($r,$type);
my ($ccrole,$categorytitle,$setquota_text,$setuploadquota_text,$setparams_text,$cat_text,
$cdom,$cnum);
@@ -268,28 +311,29 @@ sub print_modification_menu {
$categorytitle = 'View/Modify Course Settings';
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
$setuploadquota_text = &mt('Disk space allocated for storage of content uploaded directly to a course via Content Editor.');
- if ($type eq 'Placement') {
- $setparams_text = 'View/Modify course owner and self-enrollment';
- } elsif (&showcredits($dom)) {
- $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, and self-enrollment';
+ if (($type ne 'Placement') && (&showcredits($dom))) {
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, credits, self-enrollment and table lifetime';
} else {
- $setparams_text = 'View/Modify course owner, institutional code, default authentication, and self-enrollment';
+ $setparams_text = 'View/Modify course owner, institutional code, default authentication, self-enrollment and table lifetime';
}
$cat_text = 'View/Modify catalog settings for course';
}
my $anon_text = &mt('Responder threshold required to display anonymous survey submissions.');
my $postsubmit_text = &mt('Override defaults for submit button behavior post-submission for this specific course.');
+ my $mysqltables_text = &mt('Override default for lifetime of "temporary" MySQL tables containing student performance data.');
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
sub manage_selfenrollment {
- my ($cdom,$cnum,$type,$coursehash) = @_;
- my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
- if (ref($managed_by_dc) eq 'ARRAY') {
- if (@{$managed_by_dc}) {
- return 1;
- }
+ my ($cdom,$cnum,$type,$coursehash,$permission) = @_;
+ if ($permission->{'selfenroll'}) {
+ my ($managed_by_cc,$managed_by_dc) = &Apache::lonuserutils::selfenrollment_administration($cdom,$cnum,$type,$coursehash);
+ if (ref($managed_by_dc) eq 'ARRAY') {
+ if (@{$managed_by_dc}) {
+ return 1;
+ }
+ }
}
return 0;
}
@@ -304,7 +348,7 @@ sub print_modification_menu {
{
linktext => $setparams_text,
url => &phaseurl('setparms'),
- permission => 1,
+ permission => $permission->{'setparms'},
#help => '',
icon => 'crsconf.png',
linktitle => ''
@@ -312,7 +356,7 @@ sub print_modification_menu {
{
linktext => 'View/Modify quotas for group portfolio files, and for uploaded content.',
url => &phaseurl('setquota'),
- permission => 1,
+ permission => $permission->{'setquota'},
#help => '',
icon => 'groupportfolioquota.png',
linktitle => ''
@@ -320,7 +364,7 @@ sub print_modification_menu {
{
linktext => 'View/Modify responders threshold for anonymous survey submissions display',
url => &phaseurl('setanon'),
- permission => 1,
+ permission => $permission->{'setanon'},
#help => '',
icon => 'anonsurveythreshold.png',
linktitle => ''
@@ -328,7 +372,7 @@ sub print_modification_menu {
{
linktext => $cat_text,
url => &phaseurl('catsettings'),
- permission => (@additional_params > 0),
+ permission => (($permission->{'catsettings'}) && (@additional_params > 0)),
#help => '',
icon => 'ccatconf.png',
linktitle => ''
@@ -336,7 +380,7 @@ sub print_modification_menu {
{
linktext => 'Display current settings for automated enrollment',
url => &phaseurl('viewparms'),
- permission => (($type ne 'Community') && ($type ne 'Placement')),
+ permission => ($permission->{'viewparms'} && ($type ne 'Community') && ($type ne 'Placement')),
#help => '',
icon => 'roles.png',
linktitle => ''
@@ -346,7 +390,7 @@ sub print_modification_menu {
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => &phaseurl('selfenroll'),
- permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash),
+ permission => &manage_selfenrollment($cdom,$cnum,$type,$coursehash,$permission),
linktitle => 'Configure user self-enrollment.',
},
{
@@ -354,7 +398,7 @@ sub print_modification_menu {
icon => 'emblem-readonly.png',
#help => '',
url => &phaseurl('setpostsubmit'),
- permission => 1,
+ permission => $permission->{'setpostsubmit'},
linktitle => '',
},
]
@@ -375,10 +419,6 @@ sub print_modification_menu {
if ($type eq 'Community') {
$menu_html .= '
'.&mt('Community owner (permitted to assign Coordinator roles in the community).').'
'."\n".
'
'.&mt('Override defaults for who configures self-enrollment for this specific community').'
'.&mt('Override defaults for who configures self-enrollment for this specific course.').'
'."\n";
}
- $menu_html .= '
'.$setquota_text.'
'."\n".
+ $menu_html .= '
'.$mysqltables_text.'
'."\n".
+ '
'.$setquota_text.'
'."\n".
'
'.$setuploadquota_text.'
'."\n".
'
'.$anon_text.'
'."\n".
'
'.$postsubmit_text.'
'."\n";
+ my ($categories_link_start,$categories_link_end);
+ if ($permission->{'catsettings'}) {
+ $categories_link_start = '';
+ $categories_link_end = '';
+ }
foreach my $item (@additional_params) {
if ($type eq 'Community') {
if ($item eq 'togglecats') {
- $menu_html .= '
'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
'."\n";
+ $menu_html .= '
'.&mt('Hiding/unhiding a community from the catalog (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).','','').'
'."\n";
+ $menu_html .= '
'.&mt('Manual cataloging of a community (although can be [_1]configured[_2] to be modifiable by a Coordinator in community context).',$categories_link_start,$categories_link_end).'
'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
'."\n";
+ $menu_html .= '
'.&mt('Hiding/unhiding a course from the course catalog (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).','','').'
'."\n";
+ $menu_html .= '
'.&mt('Manual cataloging of a course (although can be [_1]configured[_2] to be modifiable by a Course Coordinator in course context).',$categories_link_start,$categories_link_end).'
'."\n";
}
}
}
@@ -418,18 +464,47 @@ sub print_modification_menu {
return;
}
-sub print_ccrole_selected {
+sub print_adhocrole_selected {
my ($r,$type) = @_;
&print_header($r,$type);
my ($cdom,$cnum) = split(/_/,$env{'form.pickedcourse'});
- $r->print('');
+ } else {
+ $r->print('');
+ }
+ return;
}
sub print_settings_display {
- my ($r,$cdom,$cnum,$cdesc,$type) = @_;
+ my ($r,$cdom,$cnum,$cdesc,$type,$permission) = @_;
my %enrollvar = &get_enrollment_settings($cdom,$cnum);
my %longtype = &course_settings_descrip($type);
my %lt = &Apache::lonlocal::texthash(
@@ -470,25 +545,35 @@ sub print_settings_display {
}
$disp_table .= &Apache::loncommon::end_data_table()."\n";
&print_header($r,$type);
- my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
- my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
- '=1&destinationurl=/adm/populate','&<>"');
+ my ($enroll_link_start,$enroll_link_end,$setparms_link_start,$setparms_link_end);
+ if (&Apache::lonnet::allowed('ccc',$cdom)) {
+ my $newrole = $ccrole.'./'.$cdom.'/'.$cnum;
+ my $escuri = &HTML::Entities::encode('/adm/roles?selectrole=1&'.$newrole.
+ '=1&destinationurl=/adm/populate','&<>"');
+ $enroll_link_start = '';
+ $enroll_link_end = '';
+ }
+ if ($permission->{'setparms'}) {
+ $setparms_link_start = '';
+ $setparms_link_end = '';
+ }
$r->print('