--- loncom/interface/lonsyllabus.pm 2013/05/16 20:03:51 1.127 +++ loncom/interface/lonsyllabus.pm 2013/05/19 15:48:51 1.128 @@ -1,7 +1,7 @@ # The LearningOnline Network # Syllabus # -# $Id: lonsyllabus.pm,v 1.127 2013/05/16 20:03:51 raeburn Exp $ +# $Id: lonsyllabus.pm,v 1.128 2013/05/19 15:48:51 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1067,10 +1067,10 @@ sub save_changes { unless ((ref($syllabus) eq 'HASH') && (ref($syllabusfields) eq 'HASH')) { return ($earlyout,$uploaded,$external,$minimal,$output); } - if ($env{'form.deleteuploaded'}) { + if (($env{'form.deleteuploaded_file'}) || ($env{'form.deleteuploaded_minimal'})) { my %storehash; if (($env{'form.choice'} eq 'file') && - ($env{'form.deleteuploaded'} eq 'file') && ($uploaded =~ /\w/)) { + ($env{'form.deleteuploaded_file'}) && ($uploaded =~ /\w/)) { &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.uploadedsyllabus'); &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); $storehash{'uploadedsyllabus'} = ''; @@ -1079,7 +1079,7 @@ sub save_changes { undef($uploaded); undef($external); } elsif (($env{'form.choice'} eq 'minimal') && - ($env{'form.deleteuploaded'} eq 'minimal') && ($minimal =~ /\w/)) { + ($env{'form.deleteuploaded_minimal'}) && ($minimal =~ /\w/)) { &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.externalsyllabus'); &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.minimalsyllabus'); $storehash{'externalsyllabus'} = ''; @@ -1527,7 +1527,7 @@ sub editfile_button { } $output .= ' - + '; return $output; } @@ -1545,15 +1545,17 @@ sub editbutton_js { document.location.href = url+'?editmode=1&forceedit=1'; } function dodelete(caller,url) { - document.syllabus.deleteuploaded.value=caller; - if (caller == 'minimal') { - if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) { - document.syllabus.submit(); + if (document.getElementById('deleteuploaded_'+caller)) { + document.getElementById('deleteuploaded_'+caller).value=1; + if (caller == 'minimal') { + if (confirm("$lt{'min'}"+"\\n"+"$lt{'noundo'}")) { + document.syllabus.submit(); + } } - } - if (caller == 'file') { - if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) { - document.syllabus.submit(); + if (caller == 'file') { + if (confirm("$lt{'file'}"+"\\n"+"$lt{'noundo'}")) { + document.syllabus.submit(); + } } } return;