--- loncom/interface/loncoursequeueadmin.pm 2012/08/15 14:37:13 1.31
+++ loncom/interface/loncoursequeueadmin.pm 2013/03/01 04:48:59 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.31 2012/08/15 14:37:13 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.35 2013/03/01 04:48:59 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -536,12 +536,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;
}
@@ -1352,6 +1352,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'};
@@ -1470,7 +1473,7 @@ sub get_processtype {
} else {
my %alltasks;
if (($isadv) && ($settings{'_LC_adv'} ne '')) {
- $val = $settings{$crstype}{'_LC_adv'};
+ $val = $settings{'_LC_adv'};
@{$inststatuses} = ('_LC_adv_');
} else {
if ($userenv{'inststatus'} ne '') {
@@ -1556,7 +1559,7 @@ sub queued_selfenrollment {
}
if (keys(%reqs_by_date)) {
unless ($notitle) {
- $output .= ''.&mt('Enrollment requests pending Course Coordinator approval').'
';
+ $output .= '
'.&mt('Enrollment requests pending Course Coordinator approval').'
';
}
$output .= &Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
@@ -1804,10 +1807,8 @@ sub author_prompt {
my ($is_active_author,$offer_author);
if ($env{'environment.canrequest.author'}) {
unless (&is_active_author()) {
- if ($env{'environment.canrequest.author'}) {
- unless (&reqauthor_check() =~ /^approval:\d+$/) {
- $offer_author = 1;
- }
+ unless (&reqauthor_check() =~ /^approval:\d+$/) {
+ $offer_author = 1;
}
}
}