--- loncom/homework/inputtags.pm 2019/08/11 17:16:25 1.333.2.7
+++ loncom/homework/inputtags.pm 2016/04/06 00:34:12 1.342
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# input definitons
#
-# $Id: inputtags.pm,v 1.333.2.7 2019/08/11 17:16:25 raeburn Exp $
+# $Id: inputtags.pm,v 1.342 2016/04/06 00:34:12 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -646,7 +646,7 @@ sub file_selector {
my $current_files_display = ¤t_file_submissions($part,$id);
my $addfiles;
if ($current_files_display) {
- $result .= &Apache::lonhtmlcommon::row_title(&mt('Currently submitted files')).
+ $result .= &Apache::lonhtmlcommon::row_title(&mt('Files currently selected for submission')).
$current_files_display.
&Apache::lonhtmlcommon::row_closure();
$addfiles = &mt('Submit other file(s)');
@@ -666,14 +666,13 @@ sub file_selector {
if ($constraints) {
$result .= $constraints.'
';
}
- if ($which eq 'uploadonly' || $which eq 'both') {
+ if ($which eq 'uploadonly' || $which eq 'both') {
my $free_space = $maxfilesize * 1048576;
$result .= &mt('Submit a file: (only one file per submission)').
'
'.
- '
';
- }
+ '" id="HWFILE'.$jspart.'_'.$id.'" class="flUpload" />
'.
+ '
'
+ }
if ( $which eq 'both') {
$result.='
'.''.&mt('OR:').'
';
}
@@ -694,6 +693,7 @@ sub file_selector {
&mt('Select Portfolio Files: (one or more files per submission)').'
'.
''.
'
';
+
}
$result.=&Apache::lonhtmlcommon::row_closure(1);
return $result;
@@ -706,6 +706,15 @@ sub current_file_submissions {
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();
@@ -716,7 +725,7 @@ sub current_file_submissions {
'
'.$button.' | '.$output; - if (!$no_previous) { + if ((!$no_previous) && + (($env{'course.'.$env{'request.course.id'}.'.type'} ne 'Placement') || + ($env{'request.role.adv'}))) { $output.=''.&previous_tries($id,$target).' | '; } $output.= '