--- loncom/interface/lonparmset.pm	2006/12/14 20:50:25	1.350.2.3
+++ loncom/interface/lonparmset.pm	2007/01/18 21:14:04	1.350.2.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.350.2.3 2006/12/14 20:50:25 albertel Exp $
+# $Id: lonparmset.pm,v 1.350.2.6 2007/01/18 21:14:04 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3303,6 +3303,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'));
@@ -3310,7 +3317,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//;
@@ -3320,9 +3327,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'};
@@ -3332,14 +3337,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();
         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>');
@@ -3728,7 +3734,15 @@ sub parm_change_log {
 	}
 	if ($last) { ($folder) = &Apache::lonnet::decode_symb($last); }
     }
-    foreach my $id (sort { $parmlog{$b}{'exe_time'}<=>$parmlog{$a}{'exe_time'} } (keys(%parmlog))) {
+    foreach my $id (sort 
+		    {
+			if ($parmlog{$b}{'exe_time'} ne $parmlog{$a}{'exe_time'}) {
+			    return $parmlog{$b}{'exe_time'} <=>$parmlog{$a}{'exe_time'}
+			}
+			my $aid = (split('00000',$a))[-1];
+			my $bid = (split('00000',$b))[-1];
+			return $bid<=>$aid;
+		    } (keys(%parmlog))) {
         my @changes=keys(%{$parmlog{$id}{'logentry'}});
 	my $count = 0;
 	my $time =