[LON-CAPA-cvs] cvs: loncom /interface portfolio.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Wed, 19 Jul 2006 11:43:48 -0000
This is a MIME encoded message
--raeburn1153309428
Content-Type: text/plain
raeburn Wed Jul 19 07:43:48 2006 EDT
Modified files:
/loncom/interface portfolio.pm
Log:
Breadcrumbs for group portfolio files. Link to all groups listing imcluded if originally accessed via 'Groups' link in inline menu, or GRPS button on remote.
--raeburn1153309428
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20060719074348.txt"
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.135 loncom/interface/portfolio.pm:1.136
--- loncom/interface/portfolio.pm:1.135 Mon Jul 17 22:20:19 2006
+++ loncom/interface/portfolio.pm Wed Jul 19 07:43:47 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.135 2006/07/18 02:20:19 banghart Exp $
+# $Id: portfolio.pm,v 1.136 2006/07/19 11:43:47 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,24 +44,31 @@
# returns an anchor tag consisting encoding filename and currentpath
sub make_anchor {
my ($url, $filename, $current_path, $current_mode, $field_name,
- $continue_select,$group) = @_;
+ $continue_select,$group,$refarg) = @_;
if ($continue_select ne 'true') {$continue_select = 'false'};
my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;
if (defined($group)) {
$anchor .= '&group='.$group;
+ if ($refarg ne '') {
+ $anchor .= '&'.$refarg;
+ }
}
$anchor .= '">'.$filename.'</a>';
return $anchor;
}
my $dirptr=16384;
sub display_common {
- my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_;
+ my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,$refarg)=@_;
my $namespace = &get_namespace($group);
my $port_path = &get_port_path($group);
if ($can_upload) {
my $groupitem;
if (defined($group)) {
$groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ if (exists($env{'form.ref'})) {
+ $groupitem .= '<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />';
+ }
}
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my %text=&Apache::lonlocal::texthash(
@@ -109,12 +116,12 @@
TABLE
}
my @tree = split (/\//,$current_path);
- $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
+ $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group,$refarg).'/');
if (@tree > 1){
my $newCurrentPath = '';
for (my $i = 1; $i< @tree; $i++){
$newCurrentPath .= $tree[$i].'/';
- $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
+ $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group,$refarg).'/');
}
}
$r->print('</span>');
@@ -122,6 +129,9 @@
$r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
if (defined($group)) {
$r->print('&group='.$group);
+ if ($refarg ne '') {
+ $r->print('&'.$refarg);
+ }
}
$r->print('">'.
&Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
@@ -150,7 +160,7 @@
}
sub display_directory {
my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
- $can_modify,$can_delete,$can_setacl)=@_;
+ $can_modify,$can_delete,$can_setacl,$refarg)=@_;
my $iconpath= $r->dir_config('lonIconsURL') . "/";
my ($groupitem,$groupecho);
my $display_out;
@@ -163,8 +173,14 @@
$access_admin_text = &mt('View/Change Status');
}
if ((defined($group)) && (defined($env{'request.course.id'}))) {
- $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+ $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
$groupecho = '&group='.$group;
+ if ($refarg ne '') {
+ $groupecho .= '&'.$refarg;
+ }
+ if (exists($env{'form.ref'})) {
+ $groupitem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
+ }
}
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
@@ -249,7 +265,7 @@
}
$r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
$r->print('<td>Go to ...</td>');
- $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');
+ $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group,$refarg).'/</td>');
$r->print('</tr>');
} else {
my $css_class = 'LC_browser_file';
@@ -391,6 +407,10 @@
if (defined($group)) {
$r->print("\n".'<input type="hidden" name="group" value="'.
$group.'" />');
+ if (exists($env{'form.ref'})) {
+ $r->print("\n".'<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />');
+ }
}
$r->print('</p></form>');
$r->print('<form action="'.$url.'" method="post">
@@ -399,7 +419,11 @@
$env{'form.currentpath'}.'" />');
if (defined($group)) {
$r->print("\n".'<input type="hidden" name="group" value="'.
- $group.'" />');
+ $group.'" />');
+ if (exists($env{'form.ref'})) {
+ $r->print("\n".'<input type="hidden" name="ref" value="'.
+ $env{'form.ref'}.'" />');
+ }
}
$r->print("\n".' <input type="submit" value="'.$button_text->{'cancel'}.'" />
</p></form>');
@@ -427,7 +451,7 @@
}
sub done {
- my ($message,$url,$group)=@_;
+ my ($message,$url,$group,$refarg)=@_;
unless (defined $message) {
$message='Done';
}
@@ -436,14 +460,17 @@
'&fieldname='.$env{'form.fieldname'}.
'&mode='.$env{'form.mode'};
if (defined($group)) {
- $result .= '&group='.$group;
+ $result .= '&group='.$group;
+ if ($refarg ne '') {
+ $result .= '&'.$refarg;
+ }
}
$result .= '">'.&mt($message).'</a></h3>';
return $result;
}
sub delete {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @check;
my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
$file_name = &prepend_group($file_name,$group);
@@ -451,7 +478,7 @@
my ($uname,$udom) = &get_name_dom($group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be deleted.<br />");
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
if (scalar(@files)) {
&open_form($r,$url);
@@ -459,13 +486,13 @@
&close_form($r,$url,$group);
} else {
$r->print("No file was checked to delete.<br />");
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
}
}
sub delete_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
my $result;
my ($uname,$udom) = &get_name_dom($group);
@@ -479,7 +506,7 @@
') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
}
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub delete_dir {
@@ -490,7 +517,7 @@
}
sub delete_dir_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $directory_name = $env{'form.currentpath'};
$directory_name =~ s|/$||; # remove any trailing slash
my ($uname,$udom) = &get_name_dom($group);
@@ -515,17 +542,17 @@
}
$env{'form.currentpath'} = $directory_name;
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub rename {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
my ($uname,$udom) = &get_name_dom($group);
$file_name = &prepend_group($file_name,$group);
if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
$r->print ("The file is locked and cannot be renamed.<br />");
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
} else {
&open_form($r,$url);
$r->print('<p>'.&mt('Rename').' '.&display_file().' to
@@ -535,7 +562,7 @@
}
sub rename_confirmed {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
my ($uname,$udom) = &get_name_dom($group);
my $port_path = &get_port_path($group);
@@ -543,7 +570,7 @@
$r->print('<span class="LC_error">'.
&mt("Error: no valid filename was provided to rename to.").
'</span><br />');
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
return;
}
my $result=
@@ -561,11 +588,11 @@
'<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
'<strong>'.&display_file('',$filenewname).'</strong>'));
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub display_access {
- my ($r,$url,$group,$can_setacl,$port_path) = @_;
+ my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_;
my ($uname,$udom) = &get_name_dom($group);
my $file_name = $env{'form.currentpath'}.$env{'form.access'};
$file_name = &prepend_group($file_name,$group);
@@ -590,12 +617,12 @@
$r->print($info);
}
&view_access_settings($r,$url,$group,$access_controls{$file_name},
- $aclcount);
+ $aclcount,$refarg);
}
}
sub view_access_settings {
- my ($r,$url,$group,$access_controls,$aclcount) = @_;
+ my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_;
my ($showstart,$showend);
my %todisplay;
foreach my $key (sort(keys(%{$access_controls}))) {
@@ -619,6 +646,9 @@
my $group_arg;
if ($group) {
$group_arg = '&group='.$group;
+ if ($refarg ne '') {
+ $group_arg .= '&'.$refarg;
+ }
}
$r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
$group_arg.'">'.&mt('Return to directory listing').'</a>');
@@ -729,7 +759,7 @@
sub update_access {
- my ($r,$url,$group,$port_path) = @_;
+ my ($r,$url,$group,$port_path,$refarg) = @_;
my $totalprocessed = 0;
my %processing;
my %title = (
@@ -848,6 +878,9 @@
my $group_arg;
if ($group) {
$group_arg = '&group='.$group;
+ if ($refarg) {
+ $group_arg .= '&'.$refarg;
+ }
}
$r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
'&currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
@@ -1467,7 +1500,7 @@
}
}
sub upload {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $fname=$env{'form.uploaddoc.filename'};
my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
my $disk_quota = 20000; # expressed in k
@@ -1506,17 +1539,17 @@
if (($current_disk_usage + $filesize) > $disk_quota){
$r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
'<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
}
elsif ($found_file){
if ($locked_file){
$r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
'<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
$r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
'<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
}
} else {
my $result=&Apache::lonnet::userfileupload('uploaddoc','',
@@ -1524,15 +1557,15 @@
if ($result !~ m|^/uploaded/|) {
$r->print('<span class="LC_error">'.'An errror occured ('.$result.
') while trying to upload '.&display_file().'</span><br />');
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
} else {
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
}
}
sub lock_info {
- my ($r,$url,$group) = @_;
+ my ($r,$url,$group,$refarg) = @_;
my ($uname,$udom) = &get_name_dom($group);
my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
$uname);
@@ -1560,11 +1593,11 @@
}
}
}
- $r->print(&done('Back',$url,$group));
+ $r->print(&done('Back',$url,$group,$refarg));
return 'ok';
}
sub createdir {
- my ($r,$url,$group)=@_;
+ my ($r,$url,$group,$refarg)=@_;
my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
if ($newdir eq '') {
$r->print('<span class="LC_error">'.
@@ -1598,7 +1631,7 @@
if ($newdir ne $env{'form.newdir'}) {
$r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");
}
- $r->print(&done(undef,$url,$group));
+ $r->print(&done(undef,$url,$group,$refarg));
}
sub get_portfolio_root {
@@ -1680,7 +1713,7 @@
}
sub missing_priv {
- my ($r,$url,$priv,$group) = @_;
+ my ($r,$url,$priv,$group,$refarg) = @_;
my $longtext = {
upload => 'upload files',
delete => 'delete files',
@@ -1700,7 +1733,10 @@
$longtext->{$priv}));
if ($group) {
$r->print(&mt("in the group's file repository."));
- $rtnlink .= '&group='.$group;
+ $rtnlink .= '&group='.$group;
+ if ($refarg ne '') {
+ $rtnlink .= '&'.$refarg;
+ }
} else {
$r->print(&mt('in this portfolio.'));
}
@@ -1711,17 +1747,23 @@
}
sub coursegrp_portfolio_header {
- my ($cdom,$cnum,$group,$grp_desc)=@_;
+ my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_;
my $gpterm = &Apache::loncommon::group_term();
my $ucgpterm = $gpterm;
$ucgpterm =~ s/^(\w)/uc($1)/e;
+ if ($refarg) {
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/coursegroups",
+ text=>"Groups",
+ title=>"Course Groups"});
+ }
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/$cdom/$cnum/$group/smppg",
+ ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
text=>"$ucgpterm: $grp_desc",
title=>"Go to group's home page"},
- {href=>"//?group=$group",
+ {href=>"/adm/coursegrp_portfolio?group=$group&$refarg",
text=>"Group Portfolio",
- title=>"Display group portfolio"},);
+ title=>"Display group portfolio"});
my $output = &Apache::lonhtmlcommon::breadcrumbs(
&mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
return $output;
@@ -1734,13 +1776,13 @@
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['selectfile','currentpath','meta','lockinfo','currentfile','action',
'fieldname','mode','rename','continue','group','access','setnum',
- 'cnum','cdom','type','setroles','showversions']);
+ 'cnum','cdom','type','setroles','showversions','ref']);
my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
if ($r->uri =~ m|^(/adm/)([^/]+)|) {
$url = $1.$2;
$caller = $2;
}
- my ($can_modify,$can_delete,$can_upload,$can_setacl);
+ my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg);
if ($caller eq 'coursegrp_portfolio') {
# Needs to be in a course
if (! ($env{'request.course.fn'})) {
@@ -1750,11 +1792,14 @@
return HTTP_NOT_ACCEPTABLE;
}
my $earlyout = 0;
- my $view_permission = &Apache::lonnet::allowed('vcg',
- $env{'request.course.id'});
+ my $view_permission =
+ &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
$group = $env{'form.group'};
$group =~ s/\W//g;
if ($group) {
+ if (exists($env{'form.ref'})) {
+ $refarg = 'ref='.$env{'form.ref'};
+ }
($uname,$udom) = &get_name_dom($group);
my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
$group);
@@ -1841,72 +1886,72 @@
if ($env{'form.uploaddoc.filename'}) {
if ($can_upload) {
- &upload($r,$url,$group);
+ &upload($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'upload',$group),
+ &missing_priv($r,$url,'upload',$group,$refarg),
}
} elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_confirmed($r,$url,$group);
+ &delete_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'delete') {
if ($can_delete) {
- &delete($r,$url,$group);
+ &delete($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
if ($can_delete) {
- &delete_dir_confirmed($r,$url,$group);
+ &delete_dir_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'deletedir') {
if ($can_delete) {
&delete_dir($r,$url,$group);
} else {
- &missing_priv($r,$url,'delete',$group);
+ &missing_priv($r,$url,'delete',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
if ($can_modify) {
- &rename_confirmed($r,$url,$group);
+ &rename_confirmed($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'rename',$group);
+ &missing_priv($r,$url,'rename',$group,$refarg);
}
} elsif ($env{'form.rename'}) {
$env{'form.selectfile'} = $env{'form.rename'};
$env{'form.action'} = 'rename';
if ($can_modify) {
- &rename($r,$url,$group);
+ &rename($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'rename',$group);
+ &missing_priv($r,$url,'rename',$group,$refarg);
}
} elsif ($env{'form.access'}) {
$env{'form.selectfile'} = $env{'form.access'};
$env{'form.action'} = 'chgaccess';
- &display_access($r,$url,$group,$can_setacl,$port_path);
+ &display_access($r,$url,$group,$can_setacl,$port_path,$refarg);
} elsif ($env{'form.action'} eq 'chgaccess') {
if ($can_setacl) {
- &update_access($r,$url,$group,$port_path);
+ &update_access($r,$url,$group,$port_path,$refarg);
} else {
- &missing_priv($r,$url,'setacl',$group);
+ &missing_priv($r,$url,'setacl',$group,$refarg);
}
} elsif ($env{'form.action'} eq 'rolepicker') {
if ($can_setacl) {
&role_options_window($r);
} else {
- &missing_priv($r,$url,'setacl',$group);
+ &missing_priv($r,$url,'setacl',$group,$refarg);
}
} elsif ($env{'form.createdir'}) {
if ($can_upload) {
- &createdir($r,$url,$group);
+ &createdir($r,$url,$group,$refarg);
} else {
- &missing_priv($r,$url,'upload',$group);
+ &missing_priv($r,$url,'upload',$group,$refarg);
}
} elsif ($env{'form.lockinfo'}) {
- &lock_info($r,$url,$group);
+ &lock_info($r,$url,$group,$refarg);
} else {
my $current_path='/';
if ($env{'form.currentpath'}) {
@@ -1914,7 +1959,8 @@
}
if ($caller eq 'coursegrp_portfolio') {
&Apache::lonhtmlcommon::clear_breadcrumbs();
- $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc));
+ $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc,
+ $refarg));
}
my @dir_list=&get_dir_list($portfolio_root,$group);
if ($dir_list[0] eq 'no_such_dir'){
@@ -1938,9 +1984,10 @@
# need to know if directory is empty so it can be removed if desired
my $is_empty=(@dir_list == 2);
&display_common($r,$url,$current_path,$is_empty,\@dir_list,$group,
- $can_upload);
+ $can_upload,$refarg);
&display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
- $can_upload,$can_modify,$can_delete,$can_setacl);
+ $can_upload,$can_modify,$can_delete,$can_setacl,
+ $refarg);
$r->print(&Apache::loncommon::end_page());
}
return OK;
--raeburn1153309428--