[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface loncommon.pm

raeburn raeburn@source.lon-capa.org
Sun, 19 Dec 2010 22:59:23 -0000


raeburn		Sun Dec 19 22:59:23 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/interface	loncommon.pm 
  Log:
  - Backport 1.989.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.948.2.14 loncom/interface/loncommon.pm:1.948.2.15
--- loncom/interface/loncommon.pm:1.948.2.14	Sun Dec 19 22:34:42 2010
+++ loncom/interface/loncommon.pm	Sun Dec 19 22:59:22 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.948.2.14 2010/12/19 22:34:42 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.15 2010/12/19 22:59:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3432,6 +3432,7 @@
 	my ($ign,@parts) = split(/\./,$key);
 	if ($#parts > 0) {
 	  my $data=$parts[-1];
+          next if ($data eq 'foilorder');
 	  pop(@parts);
           if ($data eq 'type') {
               unless ($showsurv) {
@@ -3468,6 +3469,7 @@
                            '<td>'.&mt('Transaction [_1]',$version).'</td>';
             if (@hidden) {
                 foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
                     my $hide;
                     foreach my $id (@hidden) {
                         if ($key =~ /^\Q$id\E/) {
@@ -3496,6 +3498,7 @@
                 }
             } else {
 	        foreach my $key (sort(keys(%lasthash))) {
+                    next if ($key =~ /\.foilorder$/);
 		    my $value = &format_previous_attempt_value($key,
 			            $returnhash{$version.':'.$key});
 		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
@@ -3507,6 +3510,7 @@
       my @currhidden = keys(%lasthidden);
       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
       foreach my $key (sort(keys(%lasthash))) {
+          next if ($key =~ /\.foilorder$/);
           if (%typeparts) {
               my $hidden;
               foreach my $id (@currhidden) {