--- loncom/interface/lonparmset.pm	2005/09/30 00:27:20	1.255
+++ loncom/interface/lonparmset.pm	2005/10/14 04:25:56	1.259
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.255 2005/09/30 00:27:20 banghart Exp $
+# $Id: lonparmset.pm,v 1.259 2005/10/14 04:25:56 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2703,7 +2703,7 @@ ENDMAINFORMHEAD
             permission => $parm_permission,
             },
           { text => 'Set Portfolio Metadata',
-	    action => 'setinstmeta',
+	    action => 'setrestrictmeta',
             permission => $parm_permission,
             },
           { text => 'Set/Modify Resource Parameters - Helper Mode',
@@ -2753,23 +2753,29 @@ ENDMAINFORMHEAD
 sub output_row {
     my ($r, $field_name, $field_text) = @_;
     my $output;
-    my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
-    my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
+    my $options=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.options'};
+    my $values=$env{'course.'.$env{'request.course.id'}.'.'.$field_name.'.values'};
     my $checked;
     unless (defined($options)) {
         $options = 'active,stuadd';
         $values = 'Type a list of values separated by commas.';
     }
-    $output.='<tr><td><strong>'.$field_text.'</strong></td>';
+    if ($options =~ m/active/) {
+        $checked = ' checked="checked" ';
+    } else {
+        $checked = '  ';
+    }
+    $output.='<tr><td><center><input type="checkbox" name="'.$field_name.'_active" value="yes"'.$checked.' /></center></td>';
+    $output.='<td><strong>'.$field_text.'</strong></td>';
     $output.='<td><input name="'.$field_name.'_values" type="text" value="'.$values.'" /></td>';
     if ($options =~ m/onlyone/) {
-        $checked = ' CHECKED ';
+        $checked = ' checked="checked" ';
     } else {
         $checked = '  ';
     }
-    $output.='<td><center><input type="checkbox" name="'.$field_name.'_onlyone"" value="yes"'.$checked.' /></center></td>';
+    $output.='<td><center><input type="checkbox" name="'.$field_name.'_onlyone" value="yes"'.$checked.' /></center></td>';
     if ($options =~ m/stuadd/) {
-        $checked = ' CHECKED ';
+        $checked = ' checked="checked" ';
     } else {
         $checked = ' ';
     }
@@ -2778,7 +2784,8 @@ sub output_row {
     $output.='</tr>';
     return ($output);
 }
-sub setinstmeta {
+
+sub setrestrictmeta {
     my ($r)=@_;
     my $next_meta;
     my $output;
@@ -2793,9 +2800,9 @@ sub setinstmeta {
 						    'Set Portfolio Metadata'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    my $key_base = $env{'course.'.$env{'request.course.id'}.'.metadata.'};
+    my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
     my $save_field = '';
-    if ($env{'form.instmeta'}) {
+    if ($env{'form.restrictmeta'}) {
         foreach my $field (sort(keys(%env))) {
             if ($field=~m/^form.(.+)_(.+)$/) {
                 my $options;
@@ -2812,10 +2819,10 @@ sub setinstmeta {
             	    if ($env{'form.'.$meta_field.'_active'}) {
             	        $options.='active,';
             	    }
-                    my $name = 'metadata.'.$save_field;
+                    my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',
-                                                  {'metadata.'.$meta_field.'.options'=>$options,
-                                                   'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
+                                                  {$meta_field.'.options'=>$options,
+                                                   $meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
                                                    },$dom,$crs);
                 }
             }
@@ -2823,23 +2830,20 @@ sub setinstmeta {
         
     }
     &Apache::lonnet::coursedescription($env{'request.course.id'});
-    my %metadata_fields = &Apache::lonmeta::fieldnames();
-   
-    foreach my $field (sort(keys (%metadata_fields))) {
-        
-        if ($field =~ m/metadata/) {
-            $output.= &output_row($r, $field, $metadata_fields{$field});
-        }
+    my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+    
+    foreach my $field (sort(keys(%metadata_fields))) {
+	$output.= &output_row($r, $field, $metadata_fields{$field});
     }
     $r->print(<<ENDenv);       
-        <form method="post" action="/adm/parmset?action=setinstmeta" name="form">
+        <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
         
         <p>
         <table border=2>
-        <tr><th>Metadata Item</th><th>Values</th><th>Only One Choice</th><th>Student Can Add Choices</th></tr>
+        <tr><th>Active</th><th>Metadata Item</th><th>Values</th><th>Only One Choice</th><th>Student Can Add Choices</th></tr>
         $output
         </table>
-        <input type="submit" name="instmeta" value="Update Portfolio Metadata">
+        <input type="submit" name="restrictmeta" value="Update Metadata Restrictions">
         </form>
 
 ENDenv
@@ -3021,6 +3025,7 @@ Main handler.  Calls &assessparms and &c
 ##################################################
 #    use Data::Dumper;
 
+
 sub handler {
     my $r=shift;
 
@@ -3081,10 +3086,10 @@ sub handler {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});
 	    &overview($r);
-        } elsif ($env{'form.action'} eq 'setinstmeta' && $parm_permission) {
-            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setinstmeta',
-						    text=>"Portfolio Metadata"});
-	    &setinstmeta($r);
+        } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
+            &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+						    text=>"Restrict Metadata"});
+	    &setrestrictmeta($r);
         } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
             &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
 						    text=>"Overview Mode"});