--- loncom/interface/lonrequestcourse.pm 2010/07/30 23:51:41 1.54.2.1 +++ loncom/interface/lonrequestcourse.pm 2010/11/19 00:01:25 1.59 @@ -1,7 +1,7 @@ # The LearningOnline Network # Request a course # -# $Id: lonrequestcourse.pm,v 1.54.2.1 2010/07/30 23:51:41 raeburn Exp $ +# $Id: lonrequestcourse.pm,v 1.59 2010/11/19 00:01:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -647,11 +647,7 @@ sub onload_action { sub print_main_menu { my ($r,$can_request,$states,$dom,$jscript,$loaditems,$crumb,$request_domains) = @_; my ($types,$typename) = &Apache::loncommon::course_types(); - my $onchange; - unless ($env{'form.interface'} eq 'textual') { - $onchange = 'this.form.submit()'; - } - + my $onchange = 'this.form.submit()'; my $nextstate_setter = "\n"; if (ref($states) eq 'HASH') { foreach my $key (keys(%{$states})) { @@ -2538,8 +2534,8 @@ sub print_review { if (($env{'form.cloning'}) && ($env{'form.clonecrs'} =~ /^$match_name$/) && ($env{'form.clonedom'} =~ /^$match_domain$/)) { - my $canclone = &Apache::loncoursequeueadmin::can_clone_course($env{'user.name'}, - $env{'user.domain'},$env{'form.clonecrs'},$env{'form.clonedom'}, + my $canclone = &Apache::loncoursequeueadmin::can_clone_course($uname, + $udom,$env{'form.clonecrs'},$env{'form.clonedom'}, $env{'form.crstype'}); if ($canclone) { my %courseenv = &Apache::lonnet::userenvironment($env{'form.clonedom'}, @@ -3040,6 +3036,10 @@ sub print_request_outcome { push(@instsections,$sec); } $sections{$i}{'loncapa'} = $env{'form.loncapasec_'.$i}; + $sections{$i}{'loncapa'} =~ s/\W//g; + if ($sections{$i}{'loncapa'} eq 'none') { + $sections{$i}{'loncapa'} = ''; + } } } } @@ -3128,10 +3128,7 @@ sub print_request_outcome { } my $autoadds = 0; if ($env{'form.autoadds'}) { - $autodrops = $env{'form.autoadds'}; - } - if ($env{'form.autoadds'}) { - $autodrops = $env{'form.autoadds'}; + $autoadds = $env{'form.autoadds'}; } my $instcode = ''; if (exists($env{'form.instcode'})) { @@ -3593,18 +3590,23 @@ sub retrieve_settings { } $env{'form.clonecrs'} = $reqinfo{'clonecrs'}; $env{'form.clonedom'} = $reqinfo{'clonedom'}; + if (($reqinfo{'clonecrs'} ne '') && ($reqinfo{'clonedom'} ne '')) { + $env{'form.cloning'} = 1; + } $env{'form.datemode'} = $reqinfo{'datemode'}; $env{'form.dateshift'} = $reqinfo{'dateshift'}; - if (($reqinfo{'crstype'} eq 'official') && ($reqinfo{'instcode'} ne '')) { - $env{'form.sectotal'} = $reqinfo{'sectotal'}; - $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'}; - $env{'form.autoadds'} = $reqinfo{'autoadds'}; - $env{'form.autdrops'} = $reqinfo{'autodrops'}; - $env{'form.instcode'} = $reqinfo{'instcode'}; - my $crscode = { - $cnum => $reqinfo{'instcode'}, - }; - &extract_instcode($dom,'instcode',$crscode,$cnum); + if ($reqinfo{'crstype'} eq 'official') { + $env{'form.autoadds'} = $reqinfo{'autoadds'}; + $env{'form.autodrops'} = $reqinfo{'autodrops'}; + if ($reqinfo{'instcode'} ne '') { + $env{'form.sectotal'} = $reqinfo{'sectotal'}; + $env{'form.crosslisttotal'} = $reqinfo{'crosslisttotal'}; + $env{'form.instcode'} = $reqinfo{'instcode'}; + my $crscode = { + $cnum => $reqinfo{'instcode'}, + }; + &extract_instcode($dom,'instcode',$crscode,$cnum); + } } my @currsec; if (ref($reqinfo{'sections'}) eq 'HASH') {