--- loncom/interface/loncoursequeueadmin.pm 2013/01/02 01:15:26 1.33
+++ loncom/interface/loncoursequeueadmin.pm 2013/12/24 19:15:10 1.38
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.33 2013/01/02 01:15:26 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.38 2013/12/24 19:15:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -435,6 +435,7 @@ sub build_queue_display {
official => 'Official course',
unofficial => 'Unofficial course',
community => 'Community',
+ textbook => 'Textbook course',
);
$output .= '
'.&mt('Type').' | '.
''.&mt('Date requested').' | '.
@@ -536,12 +537,12 @@ sub update_request_queue {
$firsturl);
my $count=0;
while (my @course = &Apache::loncommon::get_env_multiple('form.'.$count.'radioreq')) {
- if (@course[0] =~ /^\d+:.*/) {
- push(@approvals,@course[0]);
- } elsif (@course[0] =~ /^later:.*/) {
+ if ($course[0] =~ /^\d+:.*/) {
+ push(@approvals,$course[0]);
+ } elsif ($course[0] =~ /^later:.*/) {
#decide later
} else {
- push(@rejections,@course[0]);
+ push(@rejections,$course[0]);
}
$count+=1;
}
@@ -1256,7 +1257,7 @@ sub update_request_queue {
}
$output .= '';
} else {
- $output .= ''.&mt("For the following course/community requests an error occurred when removing requests for the following from the pending queue:").'
';
+ $output .= ''.&mt("For the following course/community requests an error occurred when removing requests from the pending queue:").'
';
foreach my $cnum (@warn_dels) {
my $showcourse;
if (ref($requesthash{$cnum.'_'.$queue})) {
@@ -1352,6 +1353,9 @@ sub build_batchcreatehash {
}
$batchhash{'title'} = $details->{'cdescr'};
$batchhash{'coursecode'} = $details->{'instcode'};
+ if ($domdefs->{'officialcredits'} || $domdefs->{'unofficialcredits'}) {
+ $batchhash{'defaultcredits'} = $details->{'defaultcredits'};
+ }
$batchhash{'emailenc'} = $emailenc;
$batchhash{'adds'} = $details->{'autoadds'};
$batchhash{'drops'} = $details->{'autodrops'};
@@ -1840,7 +1844,7 @@ sub process_reqauthor {
unless ($env{'environment.canrequest.author'}) {
return ''.
&mt('You do not currently have rights to request an authoring space.').'
'.
- &mt('Please contact the [_1]helpdesk[_2].','',
+ &mt('Please contact the [_1]helpdesk[_2] for assistance.','',
'').'';
}
my $queued = &reqauthor_check();