--- loncom/interface/lonmeta.pm 2006/03/02 20:16:10 1.151 +++ loncom/interface/lonmeta.pm 2006/05/20 06:34:50 1.155 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.151 2006/03/02 20:16:10 www Exp $ +# $Id: lonmeta.pm,v 1.155 2006/05/20 06:34:50 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -296,15 +296,23 @@ sub fieldnames { } sub portfolio_linked_path { - my ($path) = @_; - my $result = &Apache::portfolio::make_anchor('portfolio','/'); + my ($path,$group,$port_path) = @_; + + my $start = 'portfolio'; + if ($group) { + $start = "groups/$group/".$start; + } + my $result = &Apache::portfolio::make_anchor($port_path,$start,'/', + undef,undef,undef,$group); + my $fullpath = '/'; my (undef,@tree) = split('/',$path); my $filename = pop(@tree); foreach my $dir (@tree) { $fullpath .= $dir.'/'; $result .= '/'; - $result .= &Apache::portfolio::make_anchor($dir,$fullpath); + $result .= &Apache::portfolio::make_anchor($port_path,$dir,$fullpath, + undef,undef,undef,$group); } $result .= "/$filename"; return $result; @@ -312,9 +320,17 @@ sub portfolio_linked_path { sub portfolio_display_uri { my ($uri,$as_links)=@_; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my ($port_path,$group); + if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) { + $group = (split('/',$uri))[5]; + $port_path = '/adm/coursegrp_portfolio'; + } else { + $port_path = '/adm/portfolio'; + } $uri =~ s|.*/(portfolio/.*)$|$1|; my ($res_uri,$meta_uri) = ($uri,$uri); - if ($uri =~ /\.meta$/) { $res_uri =~ s/\.meta//; } else { @@ -322,10 +338,9 @@ sub portfolio_display_uri { } my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|); - if ($as_links) { - $res_uri = &portfolio_linked_path($res_uri); - $meta_uri = &portfolio_linked_path($meta_uri); + $res_uri = &portfolio_linked_path($res_uri,$group,$port_path); + $meta_uri = &portfolio_linked_path($meta_uri,$group,$port_path); } return ($res_uri,$meta_uri,$path); } @@ -486,7 +501,9 @@ sub prettyprint { my @Courses = split(/\s*\,\s*/,$value); my $Str='