Diff for /loncom/interface/lonnavmaps.pm between versions 1.553 and 1.556

version 1.553, 2021/07/19 15:48:26 version 1.556, 2022/06/11 03:58:58
Line 357  user into thinking that if the sequence Line 357  user into thinking that if the sequence
 under it; for example, see the "Show Uncompleted Homework" view on the  under it; for example, see the "Show Uncompleted Homework" view on the
 B<NAV> screen.  B<NAV> screen.
   
 =item * B<suppressNavmaps>: default: false  =item * B<suppressNavmap>: default: false
   
 If true, will not display Navigate Content resources.   If true, will not display Navigate Content resources. 
   
Line 1464  sub render { Line 1464  sub render {
         my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);          my $mapIterator = $navmap->getIterator(undef, undef, undef, 1);
         my $curRes;          my $curRes;
         my $found = 0;          my $found = 0;
           my $here_is_navmaps = 0; 
           if ($here =~ m{___\d+___adm/navmaps$}) {
               $here_is_navmaps = 1;
           }
                   
         # We only need to do this if we need to open the maps to show the          # We only need to do this if we need to open the maps to show the
         # current position. This will change the counter so we can't count          # current position. This will change the counter so we can't count
         # for the jump marker with this loop.          # for the jump marker with this loop.
         while ($here && ($curRes = $mapIterator->next()) && !$found) {          while ($here && ($curRes = $mapIterator->next()) && !$found && !$here_is_navmaps) {
             if (ref($curRes) && $curRes->symb() eq $here) {              if (ref($curRes) && $curRes->symb() eq $here) {
                 my $mapStack = $mapIterator->getStack();                  my $mapStack = $mapIterator->getStack();
                                   
Line 1858  END Line 1862  END
                     }                      }
                 } else {                  } else {
                     my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");                      my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink");
                     if ($deeplink =~ /^(absent|grades),/) {                      my ($state,$others,$listed) = split(/,/,$deeplink);
                       if (($listed eq 'absent') || ($listed eq 'grades')) {
                         if ($userCanSeeHidden) {                          if ($userCanSeeHidden) {
                             $args->{'mapUnlisted'} = 1;                              $args->{'mapUnlisted'} = 1;
                         } else {                          } else {
Line 3662  cause the iterator to return the top-lev Line 3667  cause the iterator to return the top-lev
 before anything else. deeplinklisted if true (default false), will  before anything else. deeplinklisted if true (default false), will
 check "listed" status of a resource with a deeplink, and unless "absent"  check "listed" status of a resource with a deeplink, and unless "absent"
 will exclude deeplink checking when retrieving the browsePriv from  will exclude deeplink checking when retrieving the browsePriv from
 lonnet::allowed().   lonnet::allowed().
   
 Thus, by default, only top-level resources will be shown. Change the  Thus, by default, only top-level resources will be shown. Change the
 condition to a 1 without changing the hash, and all resources will be  condition to a 1 without changing the hash, and all resources will be
Line 5192  sub deeplink { Line 5197  sub deeplink {
     my ($self,$caller,$action) = @_;      my ($self,$caller,$action) = @_;
     my $deeplink = $self->parmval("deeplink");      my $deeplink = $self->parmval("deeplink");
     if ($deeplink) {      if ($deeplink) {
         my ($listed,$scope,$access) = split(/,/,$deeplink);          my ($state,$others,$listed,$scope) = split(/,/,$deeplink);
         if ($action eq 'getlisted') {          if ($action eq 'getlisted') {
             return $listed;              return $listed;
         }          }
Line 5222  sub deeplink { Line 5227  sub deeplink {
                 }                  }
             }              }
         }          }
         unless (($caller eq 'sequence') || ($access eq 'any')) {          unless (($caller eq 'sequence') || ($state eq 'both')) {
             return $listed;              return $listed;
         }          }
     }      }
Line 6435  sub browsePriv { Line 6440  sub browsePriv {
     $self->{SYMB},undef,      $self->{SYMB},undef,
                                                     undef,$noblockcheck,                                                      undef,$noblockcheck,
                                                     undef,$nodeeplinkcheck,                                                      undef,$nodeeplinkcheck,
                                                     $nodeeplinkout);                                                        $nodeeplinkout);
 }  }
   
 =pod  =pod

Removed from v.1.553  
changed lines
  Added in v.1.556


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>