--- loncom/interface/lonparmset.pm	2005/10/14 17:05:44	1.260
+++ loncom/interface/lonparmset.pm	2005/11/14 14:01:52	1.266
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.260 2005/10/14 17:05:44 banghart Exp $
+# $Id: lonparmset.pm,v 1.266 2005/11/14 14:01:52 www 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;
@@ -2753,36 +2755,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 = 'Type a list of values separated by commas.';
+        $values = '';
     }
     $output.='<strong>'.$field_text.':</strong>';
-    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" /><br />';
-    if ($options =~ m/active/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_active" value="yes"'.$checked.' />';
-    $output.='Active <br />';
-    if ($options =~ m/onlyone/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = '  ';
-    }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_onlyone" value="yes"'.$checked.' />';
-    $output.='Student may select only one choice <br />';
-    if ($options =~ m/stuadd/) {
-        $checked = ' checked="checked" ';
-    } else {
-        $checked = ' ';
+    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+
+    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.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+	    &mt($opt->[1]).'</label> <br />';
     }
-    $output.='&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="'.$field_name.'_stuadd" value="yes"'.$checked.' />';
-    $output.='Student may type choices <br />';
     return ($output);
 }
 
@@ -2822,8 +2812,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 +2822,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(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">