--- loncom/interface/lonnavmaps.pm	2012/10/04 15:28:51	1.488
+++ loncom/interface/lonnavmaps.pm	2012/12/29 17:37:20	1.492
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.488 2012/10/04 15:28:51 bisitz Exp $
+# $Id: lonnavmaps.pm,v 1.492 2012/12/29 17:37:20 raeburn Exp $
 
 #
 # Copyright Michigan State University Board of Trustees
@@ -983,7 +983,7 @@ sub render_resource {
             ($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) {
             my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png';
             $editmapLink=' '.
-                         '<a href="/adm/coursedocs?command=direct&symb='.&escape($resource->symb()).'">'.
+                         '<a href="/adm/coursedocs?command=directnav&symb='.&escape($resource->symb()).'">'.
                          '<img src="'.$icon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'.
                          '</a>';
         }
@@ -1040,7 +1040,7 @@ sub render_resource {
     }
 
     if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
-        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$nonLinkedText</td>";
+        $result .= "$curMarkerBegin<a href=\"$link\">$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     } else {
         $result .= "$curMarkerBegin$linkopen$title$partLabel</a>$curMarkerEnd$editmapLink$nonLinkedText</td>";
     }
@@ -2011,6 +2011,7 @@ sub new {
 
     $self->{USERNAME} = shift || $env{'user.name'};
     $self->{DOMAIN}   = shift || $env{'user.domain'};
+    $self->{CODE}     = shift;
 
 
 
@@ -2027,7 +2028,7 @@ sub new {
     # assume there are course hashes for the specific requested user@domamin:
     #
 
-    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'})) {
+    if (($self->{USERNAME} eq $env{'user.name'}) && ($self->{DOMAIN} eq $env{'user.domain'}) && !$self->{CODE}) {
 	
 	# tie the nav hash
 	
@@ -2050,7 +2051,7 @@ sub new {
 	$self->{PARM_HASH} = \%parmhash;
 	$self->{PARM_CACHE} = {};
     } else {
-	$self->change_user($self->{USERNAME}, $self->{DOMAIN});
+	$self->change_user($self->{USERNAME}, $self->{DOMAIN},  $self->{CODE});
     }
 
     return $self;
@@ -2063,12 +2064,14 @@ sub new {
 # Parameters:
 #    user  - New user.
 #    domain- Domain the user belongs to.
+#    code  - Anonymous CODE in use.
 # Implicit inputs:
 #   
 sub change_user {
     my $self = shift;
     $self->{USERNAME} = shift;
     $self->{DOMAIN}   = shift;
+    $self->{CODE}     = shift;
 
     # If the hashes are already tied make sure to break that bond:
 
@@ -2084,7 +2087,7 @@ sub change_user {
     my ($cdom, $cnum) = split(/\_/, $env{'request.course.id'});
 
     my %big_hash;
-    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, \%big_hash);
+    &Apache::lonmap::loadmap($cnum, $cdom, $self->{USERNAME}, $self->{DOMAIN}, $self->{CODE}, \%big_hash);
     $self->{NAV_HASH} = \%big_hash;
 
 
@@ -4413,7 +4416,7 @@ sub resprintable {
     my $partsref = $self->parts();
     my @parts    = @$partsref;
 
-    if ((!defined(@parts)) || (scalar(@parts) == 0)) {
+    if (!@parts) {
 	return $self->printable(0);
     } else {
 	foreach my $part  (@parts) {