--- loncom/interface/lonmodifycourse.pm 2010/03/08 22:31:27 1.50
+++ loncom/interface/lonmodifycourse.pm 2010/05/18 16:13:31 1.54
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# handler for DC-only modifiable course settings
#
-# $Id: lonmodifycourse.pm,v 1.50 2010/03/08 22:31:27 raeburn Exp $
+# $Id: lonmodifycourse.pm,v 1.54 2010/05/18 16:13:31 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -208,53 +208,81 @@ sub print_course_selection_page {
sub print_modification_menu {
my ($r,$cdesc,$domdesc,$dom,$type) = @_;
&print_header($r,$type);
- my ($ccrole,$setquota_text,$setparams_text,$cat_text);
+ my ($ccrole,$categorytitle,$setquota_text,$setparams_text,$cat_text);
if ($type eq 'Community') {
$ccrole = 'co';
} else {
$ccrole = 'cc';
}
- my $action = '/adm/modifycourse';
if ($type eq 'Community') {
+ $categorytitle = 'View/Modify Community Settings';
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a community.');
$setparams_text = 'View/Modify community owner';
$cat_text = 'View/Modify catalog settings for community';
} else {
+ $categorytitle = 'View/Modify Course Settings';
$setquota_text = &mt('Total disk space allocated for storage of portfolio files in all groups in a course.');
$setparams_text = 'View/Modify course owner, institutional code, and default authentication';
$cat_text = 'View/Modify catalog settings for course';
}
- my @menu =
- (
- { text => $setparams_text,
- phase => 'setparms',
- },
- { text => 'View/Modify quota for group portfolio files',
- phase => 'setquota',
- }
- );
+
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom);
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type);
- if (@additional_params > 0) {
- push (@menu, { text => $cat_text,
- phase => 'catsettings',
- });
+
+ sub phaseurl {
+ my $phase = shift;
+ return "javascript:changePage(document.menu,'$phase')"
}
- unless ($type eq 'Community') {
- push(@menu,
- { text => 'Display current settings for automated enrollment',
- phase => 'viewparms',
- }
+ my @menu =
+ ({ categorytitle => $categorytitle,
+ items => [
+ {
+ linktext => $setparams_text,
+ url => &phaseurl('setparms'),
+ permission => 1,
+ #help => '',
+ icon => 'mcrs.png',
+ linktitle => ''
+ },
+ {
+ linktext => 'View/Modify quota for group portfolio files',
+ url => &phaseurl('setquota'),
+ permission => 1,
+ #help => '',
+ icon => 'mcrs.png',
+ linktitle => ''
+ },
+ {
+ linktext => $cat_text,
+ url => &phaseurl('catsettings'),
+ permission => (@additional_params > 0),
+ #help => '',
+ icon => 'mcrs.png',
+ linktitle => ''
+ },
+ {
+ linktext => 'Display current settings for automated enrollment',
+ url => &phaseurl('viewparms'),
+ permission => ($type ne 'Community'),
+ #help => '',
+ icon => 'mcrs.png',
+ linktitle => ''
+ },
+ ]
+ },
);
- }
- my $menu_html = '
'.&mt('View/Modify settings for: ').
- ' '.$cdesc.'
'."\n";
+
+ my $menu_html =
+ ''
+ .&mt('View/Modify settings for: [_1]',
+ ''.$cdesc.'')
+ .'
'."\n".'';
if ($type eq 'Community') {
$menu_html .= &mt('Although almost all community settings can be modified by a Coordinator, the following may only be set or modified by a Domain Coordinator:');
} else {
$menu_html .= &mt('Although almost all course settings can be modified by a Course Coordinator, the following may only be set or modified by a Domain Coordinator:');
}
- $menu_html .= '
';
+ $menu_html .= ''."\n".'';
if ($type eq 'Community') {
$menu_html .= '- '.&mt('Community owner (permitted to assign Coordinator roles in the community).').'
';
} else {
@@ -265,30 +293,27 @@ sub print_modification_menu {
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).','','').'
'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' - '.&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).','','').'
'."\n";
}
} else {
if ($item eq 'togglecats') {
- $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).','','').'
'."\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).','','').'
'."\n";
} elsif ($item eq 'categorize') {
- $menu_html .= ' - '.&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).','','').'
'."\n";
}
}
}
- $menu_html .= '
-
'."\n".
- &hidden_form_elements();
- foreach my $menu_item (@menu) {
- $menu_html.='';
- }
+ $menu_html .=
+ ' '
+ .'');
return;
}
@@ -779,10 +804,10 @@ sub modify_course {
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
unless ($outcome eq 'ok') {
- push(@warnings,&mt('If automatic enrollment is enabled for "[_1]" automated enrollment may fail for "[_2]" - section: [_3], for the following reason: "[_4]"',$description,$newattr{'coursecode'},$instsec,$outcome).'
');
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome).'
');
}
} else {
- push(@warnings,&mt('If automatic enrollment is enabled for "[_1]" automated enrollment may fail for "[_2]" - section: [_3], for the following reason: "[_4]"',$description,$newattr{'coursecode'},$instsec,$course_check));
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$course_check));
}
} else {
push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
@@ -795,15 +820,15 @@ sub modify_course {
my $inst_course_id = $newattr{'coursecode'}.$instsec;
my $outcome = &Apache::lonnet::auto_new_course($cnum,$cdom,$inst_course_id,$newattr{'courseowner'});
unless ($outcome eq 'ok') {
- push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3] for the following reason: "[_4]".',$description,$newattr{'coursecode'},$instsec,$outcome));
}
} else {
- push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section [_3] because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
+ push(@warnings,&mt('If automatic enrollment is enabled for "[_1]", automated enrollment may fail for "[_2]" - section: [_3], because this is not a valid section entry.',$description,$newattr{'coursecode'},$sec));
}
}
}
} else {
- push(@warnings,&mt('As no section numbers are currently listed for "[_1]" automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
+ push(@warnings,&mt('As no section numbers are currently listed for "[_1]", automated enrollment will not occur for any sections of institutional course code: "[_2]".',$description,$newattr{'coursecode'}));
}
if ( (@xlists > 0) && ($changed{'owner'}) ) {
foreach my $xlist (@xlists) {
@@ -877,20 +902,26 @@ sub update_coowners {
}
if ($settings->{'internal.courseowner'} ne $newattr->{'courseowner'}) {
my $oldowner_to_coowner;
+ my @types = ('co-owners');
if (($newattr->{'coursecode'}) && ($autocoowners)) {
my $oldowner = $settings->{'internal.courseowner'};
if ($cchash{$oldowner.':cc'}) {
- if ($settings->{'internal.co-owner'}) {
- my @current = split(',',$settings->{'internal.co-owners'});
- unless (grep(/^\Q$oldowner\E$/,@current)) {
+ my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$oldowner);
+ if ($result eq 'valid') {
+ if ($settings->{'internal.co-owner'}) {
+ my @current = split(',',$settings->{'internal.co-owners'});
+ unless (grep(/^\Q$oldowner\E$/,@current)) {
+ $oldowner_to_coowner = 1;
+ }
+ } else {
$oldowner_to_coowner = 1;
}
- } else {
- $oldowner_to_coowner = 1;
}
}
+ } else {
+ push(@types,'pendingco-owners');
}
- foreach my $type ('co-owners','pendingco-owners') {
+ foreach my $type (@types) {
if ($settings->{'internal.'.$type}) {
my @current = split(',',$settings->{'internal.'.$type});
my $newowner = $newattr->{'courseowner'};
@@ -925,10 +956,10 @@ sub update_coowners {
my %pendinghash = (
'internal.pendingco-owners' => $pendingcoowners,
);
- my $putresult = &put('environment',\%pendinghash,$cdom,$cnum);
+ my $putresult = &Apache::lonnet::put('environment',\%pendinghash,$cdom,$cnum);
if ($putresult eq 'ok') {
if ($env{'course.'.$cid.'.num'} eq $cnum) {
- &appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners});
+ &Apache::lonnet::appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners});
}
}
} else {
@@ -960,15 +991,19 @@ sub update_coowners {
my @currcoown = split(',',$settings->{'internal.coowners'});
my ($updatecoowners,$delcoowners);
foreach my $person (@currcoown) {
- my ($result,$desc) = &Apache::lonnet::valid_instcode();
+ my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$person);
if ($result eq 'valid') {
push(@newcoowners,$person);
}
}
foreach my $item (sort(keys(%cchash))) {
my ($uname,$udom,$urole) = split(':',$item);
+ next if ($uname.':'.$udom eq $newattr->{'courseowner'});
unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) {
- push(@newcoowners,$uname.':'.$udom);
+ my ($result,$desc) = &Apache::lonnet::auto_validate_instcode($cnum,$cdom,$newattr->{'coursecode'},$uname.':'.$udom);
+ if ($result eq 'valid') {
+ push(@newcoowners,$uname.':'.$udom);
+ }
}
}
if (@newcoowners) {