[LON-CAPA-cvs] cvs: loncom / lonmap.pm

[raeburn]

raeburn		Sat Jan 25 06:29:11 2014 EDT

  Modified files:              
    /loncom	lonmap.pm 
  Log:
  - When users with pav and vgr priv (e.g., Course Coordinators)  print a
    folder of resources for anonymous CODE(s) or for named student(s), e.g.,
    for a bubblesheet exam, a (recursive) hidden setting for the parent folder 
    of the current folder will be ignored (related to changes in rev. 1.11
    to address bug 6454).
  
  
Index: loncom/lonmap.pm
diff -u loncom/lonmap.pm:1.13 loncom/lonmap.pm:1.14
--- loncom/lonmap.pm:1.13	Mon Jul 22 18:07:01 2013
+++ loncom/lonmap.pm	Sat Jan 25 06:29:11 2014
@@ -2,7 +2,7 @@
 #
 #  Read maps into a 'big hash'.
 #
-# $Id: lonmap.pm,v 1.13 2013/07/22 18:07:01 bisitz Exp $
+# $Id: lonmap.pm,v 1.14 2014/01/25 06:29:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -616,9 +616,9 @@
 	my $symb=&Apache::lonnet::encode_symb($hash->{'map_id_'.$mapid},$resid,
 					      $hash->{'src_'.$rid});
 	my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb);
+        my $ignorehidden;
 
 	if ($hdnflag || lc($hidden) eq 'yes') {
-            my $ignorehidden;
             if (defined($hash->{'is_map_'.$rid})) {
                 if (($hash->{'context.nohideurl'}) && ($hash->{'context.nohideurl'} eq $hash->{'src_'.$rid})) {
                     $ignorehidden = 1; # Hidden parameter explicitly deleted 
@@ -657,12 +657,16 @@
 
 	if (defined($hash->{'is_map_'.$rid})) {
 	    if (defined($hash->{'map_start_'.$hash->{'src_'.$rid}})) {
+                my $maphidden;
+                unless ($ignorehidden) {
+                    $maphidden = $hdnflag || $hiddenurl{$rid};
+                }
 		$sofar=$newsofar=
 		    &traceroute($sofar,
 				$hash->{'map_start_'.$hash->{'src_'.$rid}},
 				$beenhere,
 				$encflag || $encurl{$rid},
-				$hdnflag || $hiddenurl{$rid}, $hash);
+				$maphidden, $hash);
 	    }
 	}