--- loncom/interface/lonpickcourse.pm 2003/11/04 16:31:50 1.11
+++ loncom/interface/lonpickcourse.pm 2004/11/12 23:29:56 1.18
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.11 2003/11/04 16:31:50 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.18 2004/11/12 23:29:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,7 +51,8 @@ ENDDOCUMENT
# Get parameters from query string
&Apache::loncommon::get_unprocessed_cgi
($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
- 'sincefilter','form','cnumelement','cdomelement']);
+ 'sincefilter','form','cnumelement',
+ 'cdomelement','cnameelement','roleelement']);
# domain filter and selection
my $domainfilter=$ENV{'form.domainfilter'};
$domainfilter=~s/\W//g;
@@ -60,9 +61,8 @@ ENDDOCUMENT
'domainfilter',1);
# description filter
my $descriptfilter=$ENV{'form.descriptfilter'};
- $descriptfilter=~s/[^\w\s]//g;
unless ($descriptfilter) { $descriptfilter=''; }
-
+ my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
# last course activity filter and selection
my $sincefilter=$ENV{'form.sincefilter'};
$sincefilter=~s/[^\d-]//g;
@@ -84,29 +84,48 @@ ENDDOCUMENT
'cac' => 'Course Activity',
'cde' => 'Course Description',
'cdo' => 'Course Domain');
+ my ($name_code,$name_input);
+ if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {
+ $name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";
+ $name_input ='';
+ }
+ my $submitopener = '';
+ my $autosubmit = '';
+ my $roleelement = '';
+ my $roledom = $ENV{'form.roleelement'};
+ if ($roledom) {
+ $roleelement = '';
+ $submitopener = &Apache::lonroles::processpick($roledom);
+ $autosubmit = 'process_pick("'.$roledom.'")';
+ }
$r->print(<
-function gochoose(cname,cdom) {
- opener.document.$ENV{'form.form'}.$ENV{'form.cnumelement'}.value=cname;
+function gochoose(cname,cdom,cdesc) {
+ $name_code
+ opener.document.$ENV{"form.form"}.$ENV{'form.cnumelement'}.value=cname;
var slct=opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'};
var i;
for (i=0;i
+$submitopener
@@ -123,23 +142,31 @@ ENDSCRIPT
$r->print('');
}
$r->print('