--- loncom/interface/lonprintout.pm 2013/03/18 16:18:44 1.627.2.4 +++ loncom/interface/lonprintout.pm 2013/05/30 05:24:11 1.627.2.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # Printout # -# $Id: lonprintout.pm,v 1.627.2.4 2013/03/18 16:18:44 raeburn Exp $ +# $Id: lonprintout.pm,v 1.627.2.5 2013/05/30 05:24:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -720,7 +720,7 @@ sub incomplete { # print_resources. # sub master_seq_to_person_seq { - my ($map, $seq, $who, $code) = @_; + my ($map, $seq, $who, $code, $nohidemap) = @_; my ($username, $userdomain, $usersection) = split(/:/, $who); @@ -731,9 +731,14 @@ sub master_seq_to_person_seq { my %seq_hash = map {$_ => 1} @$seq; my @output_seq; + + my $unhidden; + if ($perm{'pav'} && $perm{'vgr'} && $nohidemap) { + $unhidden = &Apache::lonnet::clutter($map); + } my $navmap = Apache::lonnavmaps::navmap->new($username, $userdomain, - $code); + $code,$unhidden); my ($start,$finish); if ($map) { @@ -753,7 +758,6 @@ sub master_seq_to_person_seq { # Iterate on the resource..select the items that are randomly selected # and that are in the seq_has. Presumably the iterator will take care # of the random ordering part of the deal. - # my $curres; while ($curres = $iterator->next()) { # @@ -3192,7 +3196,7 @@ ENDPART $i=int($student_counter/$helper->{'VARS'}{'NUMBER_TO_PRINT'}); } my $actual_seq = master_seq_to_person_seq($map, \@master_seq, - $person); + $person, undef, 1); my ($output,$fullname, $printed)=&print_resources($r,$helper, $person,$type, \%moreenv, $actual_seq, @@ -3313,7 +3317,7 @@ ENDPART $env{'form.CODE'} = $moreenv{'CODE'}; $actual_seq = master_seq_to_person_seq($map, \@master_seq, undef, - $moreenv{'CODE'}); + $moreenv{'CODE'}, 1); delete($env{'form.CODE'}); } my ($output,$fullname, $printed)=