--- loncom/interface/portfolio.pm 2004/12/12 01:35:44 1.65 +++ loncom/interface/portfolio.pm 2004/12/14 19:10:07 1.66 @@ -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.
"); + $r->print(&done()); + } } } @@ -366,6 +372,9 @@ sub rename_confirmed { ') while trying to rename '.&display_file().' to '. &display_file(undef,$filenewname).'
'); } + if ($filenewname ne $ENV{'form.filenewname'}) { + $r->print("The new file name was changed from:
".$ENV{'form.filenewname'}." to $filenewname "); + } $r->print(&done()); } sub select_files {