[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonnavmaps.pm
raeburn
raeburn at source.lon-capa.org
Sat May 2 17:40:02 EDT 2020
raeburn Sat May 2 21:40:02 2020 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface lonnavmaps.pm
Log:
- For 2.11
Backport 1.550
Index: loncom/interface/lonnavmaps.pm
diff -u loncom/interface/lonnavmaps.pm:1.509.2.12 loncom/interface/lonnavmaps.pm:1.509.2.13
--- loncom/interface/lonnavmaps.pm:1.509.2.12 Thu Mar 5 23:12:23 2020
+++ loncom/interface/lonnavmaps.pm Sat May 2 21:40:02 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.509.2.12 2020/03/05 23:12:23 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.509.2.13 2020/05/02 21:40:02 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
@@ -3799,7 +3799,8 @@
# That ends the main iterator logic. Now, do we want to recurse
# down this map (if this resource is a map)?
if ( ($self->{HERE}->is_sequence() || (!$closeAllPages && $self->{HERE}->is_page())) &&
- (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION})) {
+ (defined($self->{FILTER}->{$self->{HERE}->map_pc()}) xor $self->{CONDITION}) &&
+ ($env{'request.role.adv'} || !$self->{HERE}->randomout())) {
$self->{RECURSIVE_ITERATOR_FLAG} = 1;
my $firstResource = $self->{HERE}->map_start();
my $finishResource = $self->{HERE}->map_finish();
More information about the LON-CAPA-cvs
mailing list