[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /homework inputtags.pm
raeburn
raeburn at source.lon-capa.org
Thu Mar 19 04:40:39 EDT 2015
raeburn Thu Mar 19 08:40:39 2015 EDT
Modified files: (Branch: version_2_11_X)
/loncom/homework inputtags.pm
Log:
- For 2.11
Changes in rev. 1.329 (support for submission of files to externalresponse)
not in 2.11.
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.333 loncom/homework/inputtags.pm:1.333.2.1
--- loncom/homework/inputtags.pm:1.333 Wed Mar 18 12:53:24 2015
+++ loncom/homework/inputtags.pm Thu Mar 19 08:40:38 2015
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333 2015/03/18 12:53:24 raeburn Exp $
+# $Id: inputtags.pm,v 1.333.2.1 2015/03/19 08:40:38 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -640,7 +640,7 @@
my $current_files_display = ¤t_file_submissions($part,$id);
my $addfiles;
if ($current_files_display) {
- $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
$current_files_display.
&Apache::lonhtmlcommon::row_closure();
$addfiles = &mt('Submit other file(s)');
@@ -698,15 +698,6 @@
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 @unversioned;
- foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
- my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
- my ($origname,$version,$ext) = &Apache::lonnet::file_name_version_ext($name);
- unless ($version) {
- push(@unversioned,$file);
- }
- }
- return if (!@unversioned);
my $header = &portpath_popup_js().
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
@@ -717,7 +708,7 @@
'<th>'.&mt('Size (MB)').'</th>'.
'<th>'.&mt('Last Modified').'</th>'.
&Apache::loncommon::end_data_table_header_row();
- my ($symb,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
+ my (undef,$crsid,$udom,$uname)=&Apache::lonnet::whichuser();
my ($cdom,$cnum) = ($crsid =~ /^($LONCAPA::match_domain)_($LONCAPA::match_courseid)$/);
my ($result,$header_shown,%okfiles,%rows,%legacy, at bad_file_list);
if ($uploadedfile) {
@@ -736,9 +727,9 @@
push(@bad_file_list,$error);
}
}
- if (@unversioned > 0) {
+ if ($portfiles =~ /[^\s]/) {
my $prefix = "/uploaded/$udom/$uname/portfolio";
- foreach my $file (@unversioned) {
+ foreach my $file (split(/\s*,\s*/,&unescape($portfiles))) {
my ($path,$name) = ($file =~ m{^(.*/)([^/]+)$});
my $url = $prefix.$path.$name;
my $uploadedfile = &HTML::Entities::encode($url,'<>&"');
More information about the LON-CAPA-cvs
mailing list