--- loncom/interface/londocs.pm 2011/10/31 01:22:25 1.462 +++ loncom/interface/londocs.pm 2011/11/27 21:04:19 1.465 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.462 2011/10/31 01:22:25 raeburn Exp $ +# $Id: londocs.pm,v 1.465 2011/11/27 21:04:19 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1577,7 +1577,7 @@ sub handle_edit_cmd { if ($cmd eq 'del') { if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && - ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) { + ($url!~/$LONCAPA::assess_page_seq_re/)) { &Apache::lonnet::removeuploadedurl($url); } else { &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); @@ -2872,12 +2872,24 @@ sub handler { my $containertag; my $uploadtag; +# Do we directly jump somewhere? + if ($env{'form.command'} eq 'direct') { + (my $mapurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); + my $maptitle = &Apache::lonnet::gettitle($mapurl); + $mapurl=~s{^.*/([^/]+)\.\w+$}{$1}; + $env{'form.folderpath'}= + 'default&'.&Apache::lonhtmlcommon::entity_encode('Main Course Documents'). + '&default&...::::&'. + &Apache::lonhtmlcommon::entity_encode($mapurl).'&'. + &Apache::lonhtmlcommon::entity_encode($maptitle).'::::'; + } + # Where do we store these for when we come back? my $stored_folderpath='docs_folderpath'; if ($supplementalflag) { $stored_folderpath='docs_sup_folderpath'; } - + # No folderpath, no pagepath, see if we have something stored if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) { &Apache::loncommon::restore_course_settings($stored_folderpath,