--- loncom/interface/lonnavmaps.pm	2016/09/01 19:31:05	1.523
+++ loncom/interface/lonnavmaps.pm	2016/11/22 00:43:12	1.525
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.523 2016/09/01 19:31:05 damieng Exp $
+# $Id: lonnavmaps.pm,v 1.525 2016/11/22 00:43:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -995,7 +995,8 @@ sub render_resource {
             $linkopen = "";
             $linkclose = "";
         }
-        if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
+        if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+              (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) &&
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
             if (!$params->{'map_no_edit_link'}) {
                 my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
@@ -1540,7 +1541,8 @@ END
 	$result.='</form>';
     }
     if (($args->{'caller'} eq 'navmapsdisplay') &&
-        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+        ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) ||
+         (&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) {
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         if ($env{'course.'.$env{'request.course.id'}.'.url'} eq 
@@ -4787,8 +4789,14 @@ sub getReturnHash {
     my $self = shift;
     
     if (!defined($self->{RETURN_HASH})) {
-        my %tmpHash  = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
-        $self->{RETURN_HASH} = \%tmpHash;
+        #my %tmpHash  = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME});
+        #$self->{RETURN_HASH} = \%tmpHash;
+        # When info is retrieved for several resources (as when rendering a directory),
+        # it is much faster to use the user profile dump and avoid repeated lonnet requests
+        # (especially since lonnet::currentdump is using Lond directly whenever possible,
+        # and lonnet::restore is not at this point).
+        $self->{NAV_MAP}->get_user_data();
+        $self->{RETURN_HASH} = $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}};
     }
 }