version 1.19, 2009/08/20 21:15:37
|
version 1.20, 2009/08/21 13:18:46
|
Line 116 use LONCAPA qw(:DEFAULT :match);
|
Line 116 use LONCAPA qw(:DEFAULT :match);
|
|
|
sub handler { |
sub handler { |
my ($r) = @_; |
my ($r) = @_; |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
if ($r->header_only) { |
if ($r->header_only) { |
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
|
return OK; |
return OK; |
} |
} |
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
|
|
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
my $dom = &get_course_dom(); |
my $dom = &get_course_dom(); |
Line 159 sub handler {
|
Line 157 sub handler {
|
$states{'view'} = ['pick_request','details','cancel','removal']; |
$states{'view'} = ['pick_request','details','cancel','removal']; |
$states{'log'} = ['filter','display']; |
$states{'log'} = ['filter','display']; |
$states{'new'} = ['courseinfo','enrollment','personnel','review','process']; |
$states{'new'} = ['courseinfo','enrollment','personnel','review','process']; |
|
|
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) { |
if (($action eq 'new') && ($env{'form.crstype'} eq 'official')) { |
unless ($env{'form.state'} eq 'crstype') { |
unless ($env{'form.state'} eq 'crstype') { |
unshift (@{$states{'new'}},'codepick'); |
unshift(@{$states{'new'}},'codepick'); |
} |
} |
} |
} |
|
|
Line 811 sub print_request_form {
|
Line 810 sub print_request_form {
|
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker. |
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box().$codepicker. |
&Apache::lonhtmlcommon::end_pick_box().'</div>'); |
&Apache::lonhtmlcommon::end_pick_box().'</div>'); |
} else { |
} else { |
|
$next = $states->{$action}[$page+2]; |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
} |
} |
} else { |
} else { |
|
if ($crstype eq 'official') { |
|
$next = $states->{$action}[$page+2]; |
|
} |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
} |
} |
} elsif ($prev eq 'codepick') { |
} elsif ($prev eq 'codepick') { |
|
if ($env{'form.instcode'} eq '') { |
|
$prev = $states->{$action}[$page-2]; |
|
} |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
$r->print(&courseinfo_form($dom,$formname,$crstype,$next)); |
} elsif ($state eq 'enrollment') { |
} elsif ($state eq 'enrollment') { |
if ($crstype eq 'official') { |
if ($crstype eq 'official') { |
Line 2391 sub retrieve_settings {
|
Line 2397 sub retrieve_settings {
|
if (grep(/^\Q$sec\E/,@currsec)) { |
if (grep(/^\Q$sec\E/,@currsec)) { |
$env{'form.person_'.$i.'_sec'} = $sec; |
$env{'form.person_'.$i.'_sec'} = $sec; |
} else { |
} else { |
push (@newsecs,$sec); |
push(@newsecs,$sec); |
} |
} |
} |
} |
} |
} |