--- loncom/interface/lonparmset.pm	2007/01/04 19:34:13	1.356
+++ loncom/interface/lonparmset.pm	2007/01/15 23:04:35	1.359
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.356 2007/01/04 19:34:13 albertel Exp $
+# $Id: lonparmset.pm,v 1.359 2007/01/15 23:04:35 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3288,7 +3288,7 @@ sub order_meta_fields {
                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
 	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
     }
-    my $fields = &get_added_meta_fieldnames();
+    my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
     if (!@fields_in_order) {
@@ -3323,6 +3323,13 @@ sub order_meta_fields {
     $r->print('</table>');
     return 'ok';
 }
+sub continue {
+    my $output;
+    $output .= '<form action="" method="post">';
+    $output .= '<input type="hidden" name="action" value="setrestrictmeta" />';
+    $output .= '<input type="submit" value="Continue" />';
+    return ($output);
+}
 sub addmetafield {
     my ($r)=@_;
     $r->print(&Apache::loncommon::start_page('Add Metadata Field'));
@@ -3330,7 +3337,7 @@ sub addmetafield {
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (exists($env{'form.undelete'})) {
-        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');
+        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undeletefield');
         foreach my $meta_field(@meta_fields) {
             my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
             $options =~ s/deleted//;
@@ -3340,9 +3347,7 @@ sub addmetafield {
                                         
             $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
         }
-        $r->print('<form action="" method="post">');
-        $r->print('<input type="hidden" name="action" value="setrestrictmeta" />');
-        $r->print('<input type="submit" value="Continue" />');
+        $r->print(&continue());
     } elsif (exists($env{'form.fieldname'})) {
         my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};
@@ -3352,14 +3357,15 @@ sub addmetafield {
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
-        $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
+        $r->print('Added new Metadata Field <strong>'.$env{'form.fieldname'}."</strong> with result ".$put_result.'<br />');
+        $r->print(&continue());
     } else {
-        my $fields = &get_deleted_meta_fieldnames();
+        my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');
             foreach my $key(keys(%$fields)) {
-                $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');
+                $r->print('<input type="checkbox" name="undeletefield" value="'.$key.'" />'.$$fields{$key}.'<br /');
             }
             $r->print('<input type="submit" name="undelete" value="Undelete" />');
             $r->print('</form>');
@@ -3419,7 +3425,7 @@ sub setrestrictmeta {
     # Get the default metadata fields
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
-    my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
+    my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
@@ -3455,9 +3461,10 @@ ENDenv
 }
 ##################################################
 sub get_added_meta_fieldnames {
+    my ($cid) = @_;
     my %fields;
     foreach my $key(%env) {
-        if ($key =~ m/\.metadata\.(.+)\.added$/) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;
             my ($display_field_name) = $env{$key};
             $fields{$field_name} = $display_field_name;
@@ -3466,10 +3473,10 @@ sub get_added_meta_fieldnames {
     return \%fields;
 }
 sub get_deleted_meta_fieldnames {
+    my ($cid) = @_;
     my %fields;
-    my ($default_fields) = @_;
     foreach my $key(%env) {
-        if ($key =~ m/\.metadata\.(.+)\.added$/) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;
             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
                 my ($display_field_name) = $env{$key};