--- loncom/homework/inputtags.pm 2010/08/27 17:21:01 1.269
+++ loncom/homework/inputtags.pm 2010/08/29 19:39:16 1.270
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.269 2010/08/27 17:21:01 raeburn Exp $
+# $Id: inputtags.pm,v 1.270 2010/08/29 19:39:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -527,13 +527,15 @@ sub current_file_submissions {
my ($part,$id) = @_;
my $jspart=$part;
$jspart=~s/\./_/g;
- my $uploadedfile=&HTML::Entities::encode($Apache::lonhomework::history{"resource.$part.$id.uploadedfile"},'<>&"');
+ my $uploadedfile=$Apache::lonhomework::history{"resource.$part.$id.uploadedfile"};
my $portfiles=$Apache::lonhomework::history{"resource.$part.$id.portfiles"};
return if (($uploadedfile eq '') && ($portfiles !~/[^\s]/));
my $header = &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_header_row().
- '
'.&mt('Delete?').' | '.
- ''.&mt('Name').' | '.
+ &Apache::loncommon::start_data_table_header_row();
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $header .= ''.&mt('Delete?').' | ';
+ }
+ $header .= ''.&mt('Name').' | '.
''.&mt('Size (MB)').' | '.
''.&mt('Last Modified').' | '.
&Apache::loncommon::end_data_table_header_row();
@@ -542,9 +544,10 @@ sub current_file_submissions {
my ($result,$header_shown,%okfiles,%rows,@bad_file_list);
if ($uploadedfile) {
my $url=$Apache::lonhomework::history{"resource.$part.$id.uploadedurl"};
- my ($path,$name) = ($url =~ m{^/uploaded/\Q$cdom\E/\Q$cnum\E/(essayresponse/.+/)([^/]+)});
+ my $link = &HTML::Entities::encode($url,'<>&"');
+ my ($path,$name) = ($url =~ m{^(/uploaded/\Q$udom\E/\Q$uname\E/essayresponse.*/)([^/]+)$});
my ($status,$hashref,$error) =
- ¤t_file_info($url,$uploadedfile,$name,$path);
+ ¤t_file_info($url,$link,$name,$path);
if ($status eq 'ok') {
push(@{$okfiles{$name}},$url);
$rows{$url} = $hashref;
@@ -584,9 +587,13 @@ sub current_file_submissions {
$header_shown = 1;
}
$result.=
- &Apache::loncommon::start_data_table_row()."\n".
- ' | '."\n".
+ &Apache::loncommon::start_data_table_row()."\n";
+ if ($Apache::inputtags::status[-1] eq 'CAN_ANSWER') {
+ $result .=
+ ' | '."\n";
+ }
+ $result .=
''.$name.' | '."\n".
''.$rows{$url}{size}.' | '."\n".