'.
@@ -1259,18 +1259,12 @@ sub reenable_folder {
sub modify_folders {
my ($cdom,$cnum,$groupname) = @_;
- my ($outcome,$groupmap,$groupmapres,$map,$id,$src);
+ my $outcome;
my $navmap = Apache::lonnavmaps::navmap->new();
- if (!defined($navmap)) {
- $outcome = '
'.
- &mt('Error reading course contents.').' '.
- &mt('You need to re-initialize the course.').
- '
';
- return $outcome;
- }
- $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
+ my $groupmap = '/uploaded/'.$cdom.'/'.$cnum.'/'.'group_folder_'.
$groupname.'.sequence';
- $groupmapres = $navmap->getResourceByUrl($groupmap);
+ my $groupmapres = $navmap->getResourceByUrl($groupmap);
+ my ($map,$id,$src);
if ($groupmapres) {
($map,$id,$src)=&Apache::lonnet::decode_symb($groupmapres->symb());
}
@@ -1674,8 +1668,8 @@ END
'.&mt('Granularity:').'
'.$lt{'doyo'}.' ');
if ($action eq 'modify') {
- $r->print(' ('.&mt('Currently set to "[_1]"',
- &mt($$stored{'granularity'})).')');
+ $r->print(' ('.&mt('Currently set to [_1].'
+ ,'"'.&mt($$stored{'granularity'}).'"').')');
}
$r->print('
@@ -3228,49 +3222,36 @@ sub write_group_data {
my $crspath = '/uploaded/'.$cdom.'/'.$cnum.'/';
my $boardsmap = $crspath.'group_boards_'.$groupname.'.sequence';
my $navmap = Apache::lonnavmaps::navmap->new();
- my ($bbmapres,$error);
- if (defined($navmap)) {
- $bbmapres = $navmap->getResourceByUrl($boardsmap);
- undef($navmap);
- if (!$bbmapres) {
- my $grpmap = $crspath.'group_folder_'.$groupname.'.sequence';
- my $disctitle = &mt('Discussion Boards');
- my $outcome = &map_updater($cdom,$cnum,'group_boards_'.
- $groupname.'.sequence','bbseq',
- $disctitle,$grpmap);
- my ($furl,$ferr) =
- &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
- # modify parameter
- if ($outcome eq 'ok') {
- $navmap = Apache::lonnavmaps::navmap->new();
- if (defined($navmap)) {
- my $parm_result = &parm_setter($navmap,$cdom,$boardsmap,
- $groupname);
- if ($parm_result) {
- $error = &mt('An error occurred while setting parameters '
- .'for Discussion Boards folder: '
- .'[_1]',$parm_result);
- } else {
- $r->print('
');
}
+ } else {
+ $r->print($outcome);
}
- } else {
- $error = &mt("An error occurred while retrieving the contents of the group's folder.").' '.
- &mt('You need to re-initialize the course.');
- }
- if ($error ne '') {
- $r->print('
'.$error.'
');
+ undef($navmap);
}
}
$r->print('
'
@@ -3528,7 +3509,6 @@ sub mapping_options {
'adds' => "If automatic $gpterm enrollment is enabled, when a user is newly assigned a ".lc($crstype)."-wide or section-specific role, he/she will automatically be added as a member of the $gpterm, with start and end access dates defined by the default dates set for the $gpterm, unless he/she is already a $gpterm member, with access dates that permit either current or future $gpterm access.",
'drops' => "If automatic $gpterm disenrollment is enabled, when a user's role is expired, access to the $gpterm will be terminated unless the user continues to have other ".lc($crstype)."-wide or section-specific active or future roles which receive automatic membership in the $gpterm.",
'pirs' => "Pick roles and sections for automatic $gpterm enrollment",
- 'curr' => 'Currently set to',
'on' => 'on',
'off' => 'off',
'auad' => "Automatically enable $gpterm membership when roles are added?",
@@ -3556,14 +3536,14 @@ sub automapping {
'.$$lt{'auad'}.':
');
if ($action eq 'modify') {
- $r->print(' ('.$$lt{'curr'}.' '.$$lt{$add}.')');
+ $r->print(' ('.&mt('Currently set to [_1].',''.$$lt{$add}.'').')');
}
$r->print('
'.$$lt{'auex'}.':
');
if ($action eq 'modify') {
- $r->print(' ('.$$lt{'curr'}.' '.$$lt{$drop}.')');
+ $r->print(' ('.&mt('Currently set to [_1].',''.$$lt{$drop}.'').')');
}
$r->print('
'.$$lt{'mapr'});
}
@@ -3806,7 +3786,7 @@ sub add_group_folder {
if ($delresult ne 'ok') {
$warning = $delresult;
}
- return $outcome.$warning;
+ return $outcome;
}
}
my $delresult = &release_folder_lock($cdom,$cnum,'group_allfolders');
@@ -3816,7 +3796,7 @@ sub add_group_folder {
} else {
$outcome = ''
.&mt('Could not obtain exclusive lock to check status of the folder for all groups. No group folder added.')
- .'';
+ .'
';
return $outcome;
}
my $grpfolder = &mt($ucgpterm.' Folder - [_1]',$description);
@@ -3847,10 +3827,6 @@ sub add_group_folder {
}
my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
my $navmap = Apache::lonnavmaps::navmap->new();
- if (!defined($navmap)) {
- return $warning.''.&mt('Error retrieving course contents').
- ' '.&mt('You need to re-initialize the course.').'';
- }
# modify parameters
my $parm_result;
if ($action eq 'create') {
@@ -3956,13 +3932,6 @@ sub new_map {
sub parm_setter {
my ($navmap,$cdom,$url,$groupname) = @_;
my $allresults;
- if (!defined($navmap)) {
- $allresults = '
'.
- &mt('Parameters not set for [_1] because the contents of the course could not be retrieved.',$url).' '.
- &mt('You need to reinitialize the course.').
- '