--- loncom/interface/lonparmset.pm 2005/10/17 21:33:52 1.261
+++ loncom/interface/lonparmset.pm 2005/11/17 20:04:05 1.267
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.261 2005/10/17 21:33:52 banghart Exp $
+# $Id: lonparmset.pm,v 1.267 2005/11/17 20:04:05 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -316,6 +316,8 @@ sub storeparm_by_symb {
# store parameter
&storeparm_by_symb_inner
($symb,$spnam,$snum,$nval,$ntype,$uname,$udom,$csec);
+# don't do anything if parameter was reset
+ unless ($nval) { return; }
my ($prefix,$parm)=($spnam=~/^(.*[\_\.])([^\_\.]+)$/);
# remember that this was set
$recstack{$parm}=1;
@@ -1571,10 +1573,7 @@ Set Defaults for All Resources in $folde
Specifically for
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(&mt("User")." $uname \($person\) ".
&mt('in')." \n");
} else {
@@ -1652,10 +1651,7 @@ ENDMAPONE
$coursename
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(" ".&mt("User")." $uname \($person\) \n");
} else {
$r->print(" ".&mt("ALL")." ".&mt("USERS")." \n");
@@ -2753,36 +2749,24 @@ ENDMAINFORMHEAD
sub output_row {
my ($r, $field_name, $field_text) = @_;
my $output;
- my $options=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.options'};
- my $values=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.values'};
- my $checked;
+ my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
+ my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
unless (defined($options)) {
$options = 'active,stuadd';
$values = '';
}
$output.=''.$field_text.':';
- $output.='
';
- if ($options =~ m/active/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $output.=' ';
- $output.='Show to student
';
- if ($options =~ m/onlyone/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
- }
- $output.=' ';
- $output.='Student may select only one choice
';
- if ($options =~ m/stuadd/) {
- $checked = ' checked="checked" ';
- } else {
- $checked = ' ';
+ $output.='
';
+
+ my @options= ( ['active', 'Show to student'],
+ ['onlyone','Student may select only one choice'],
+ ['stuadd', 'Student may type choices']);
+ foreach my $opt (@options) {
+ my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ $output.=(' 'x5).'
';
}
- $output.=' ';
- $output.='Student may type choices
';
return ($output);
}
@@ -2822,8 +2806,8 @@ sub setrestrictmeta {
}
my $name = $save_field;
$put_result = &Apache::lonnet::put('environment',
- {$meta_field.'.options'=>$options,
- $meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+ {'metadata.'.$meta_field.'.options'=>$options,
+ 'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
},$dom,$crs);
}
}
@@ -2832,7 +2816,10 @@ sub setrestrictmeta {
&Apache::lonnet::coursedescription($env{'request.course.id'});
my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
foreach my $field (sort(keys(%metadata_fields))) {
- $output.= &output_row($r, $field, $metadata_fields{$field});
+ &Apache::lonnet::logthis ($field);
+ if ($field ne 'courserestricted') {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
}
$r->print(<