--- loncom/interface/portfolio.pm 2004/12/12 01:35:44 1.65
+++ loncom/interface/portfolio.pm 2004/12/14 19:17:54 1.67
@@ -249,7 +249,7 @@ sub display_file {
$display_file_text = ''.$path.$filename.'';
} elsif (ref($filename) eq "ARRAY") {
foreach (@$filename) {
- $display_file_text .= ''.$path.$_.'';
+ $display_file_text .= ''.$path.$_.'
';
}
} elsif (ref($filename) eq "SCALAR") {
$display_file_text = ''.$path.$filename.'';
@@ -270,13 +270,19 @@ sub delete {
my @check;
my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
+
if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
$r->print ("The file is locked and cannot be deleted.
");
$r->print(&done());
} else {
- &open_form($r);
- $r->print('
'.&mt('Delete').' '.&display_file(undef,\@files).'?
'); - &close_form($r); + if (scalar(@files)) { + &open_form($r); + $r->print(''.&mt('Delete').' '.&display_file(undef,\@files).'?
'); + &close_form($r); + } else { + $r->print("No file was checked to delete.