--- loncom/interface/portfolio.pm 2024/09/07 01:38:36 1.254.2.6.2.3 +++ loncom/interface/portfolio.pm 2024/09/07 22:00:49 1.254.2.6.2.5 @@ -1,7 +1,7 @@ # The LearningOnline Network # portfolio browser # -# $Id: portfolio.pm,v 1.254.2.6.2.3 2024/09/07 01:38:36 raeburn Exp $ +# $Id: portfolio.pm,v 1.254.2.6.2.5 2024/09/07 22:00:49 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -267,7 +267,7 @@ sub display_directory_line { sub display_directory { my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload, - $can_modify,$can_delete,$can_setacl,$can_viewacl)=@_; + $can_modify,$can_delete,$can_setacl,$can_viewacl,$caller)=@_; my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $select_mode; my $checked_files; @@ -315,10 +315,10 @@ sub display_directory { .'

' ); my ($acl_helpfile,$acl_helplink); - if ($can_setacl) { - $acl_helpfile = 'Portfolio ShareFile'; - } elsif ($caller eq 'coursegrp_portfolio') { + if ($caller eq 'coursegrp_portfolio') { $acl_helpfile = 'Portfolio ShareFile Group'; + } elsif ($can_setacl) { + $acl_helpfile = 'Portfolio ShareFile'; } unless ($can_setacl || $can_viewacl) { $acl_helpfile = 'Portfolio ShareFile Off'; @@ -2764,7 +2764,7 @@ sub handler { $can_modify = 1; $can_delete = 1; $can_upload = 1; - if (&Apache::lonnet::usertools_access('','','portaccess', + if (&Apache::lonnet::usertools_access($uname,$udom,'portaccess', undef,'tools')) { $can_viewacl = 1; $can_setacl = 1; @@ -3031,7 +3031,7 @@ sub handler { $can_upload,$group); &display_directory($r,$url,$current_path,$is_empty,$dirlistref,$group, $can_upload,$can_modify,$can_delete,$can_setacl, - $can_viewacl); + $can_viewacl,$caller); } $r->print(&Apache::loncommon::end_page()); return OK;