[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm
raeburn
raeburn at source.lon-capa.org
Sat Aug 6 16:00:30 EDT 2016
raeburn Sat Aug 6 20:00:30 2016 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface londocs.pm
Log:
- For 2.11
- Backport 1.602, 1.603
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.62 loncom/interface/londocs.pm:1.484.2.63
--- loncom/interface/londocs.pm:1.484.2.62 Fri Aug 5 22:19:42 2016
+++ loncom/interface/londocs.pm Sat Aug 6 20:00:29 2016
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.62 2016/08/05 22:19:42 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.63 2016/08/06 20:00:29 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2810,7 +2810,7 @@
$r->print($upload_output);
# Rename, cut, copy or remove a single resource
- if (&handle_edit_cmd()) {
+ if (&handle_edit_cmd($coursenum,$coursedom)) {
my $contentchg;
if ($env{'form.cmd'} =~ m{^(remove|cut)_}) {
$contentchg = 1;
@@ -3480,6 +3480,7 @@
$currgroups);
my ($copylink,$cutlink,$removelink);
my $skip_confirm = 0;
+ my $confirm_removal = 0;
if ( $folder =~ /^supplemental/
|| ($url =~ m{( /smppg$
|/syllabus$
@@ -3490,6 +3491,10 @@
|| $isexternal) {
$skip_confirm = 1;
}
+ if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+ ($url!~/$LONCAPA::assess_page_seq_re/)) {
+ $confirm_removal = 1;
+ }
if ($denied{'copy'}) {
$copylink=(<<ENDCOPY)
@@ -3532,11 +3537,12 @@
ENDREM
} else {
my $formname = 'edit_remove_'.$orderidx;
- my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);";
+ my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);";
$removelink=(<<ENDREM);
<form name="$formname" method="post" action="/adm/coursedocs">
$form_common
<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" />
+<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" />
<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a>
$form_end
ENDREM
@@ -5816,16 +5822,18 @@
p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
p_chn => 'New Title',
p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
- p_rmr2a => 'Remove[_99]',
- p_rmr2b => '?[_99]',
- p_rmr3a => 'Remove those [_2]',
- p_rmr3b => 'items?[_2]',
+ p_rmr2a => 'Remove',
+ p_rmr2b => '?',
+ p_rmr3a => 'Remove those',
+ p_rmr3b => 'items?',
+ p_rmr4 => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".',
+ p_rmr5 => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.',
p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
- p_ctr2a => 'Cut[_98]',
- p_ctr2b => '?[_98]',
- p_ctr3a => 'Cut those[_2]',
- p_ctr3b => 'items?[_2]',
+ p_ctr2a => 'Cut',
+ p_ctr2b => '?',
+ p_ctr3a => 'Cut those',
+ p_ctr3b => 'items?',
rpck => 'Enter number to pick (e.g., 3)',
imsfile => 'You must choose an IMS package for import',
imscms => 'You must select which Course Management System was the source of the IMS package',
@@ -6196,7 +6204,7 @@
return;
}
-function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) {
+function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) {
var dosettings;
var doaction;
var control = document.togglemultsettings;
@@ -6234,7 +6242,21 @@
targetform.markcopy.value=idx+':'+param;
targetform.copyfolder.value=folder+'.'+container;
if (param == 'remove') {
- if (skip_confirm || confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
+ var doremove = 0;
+ if (skip_confirm) {
+ if (confirm_removal) {
+ if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) {
+ doremove = 1;
+ }
+ } else {
+ doremove = 1;
+ }
+ } else {
+ if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) {
+ doremove = 1;
+ }
+ }
+ if (doremove) {
targetform.markcopy.value='';
targetform.copyfolder.value='';
targetform.submit();
@@ -6491,6 +6513,7 @@
var doactions = multiActions();
var cutwarnings = 0;
var remwarnings = 0;
+ var removalinfo = 0;
if (doactions == 1) {
var remidxlist = document.cumulativeactions.allremoveidx.value;
if ((remidxlist != '') && (remidxlist != null)) {
@@ -6505,6 +6528,11 @@
remwarnings ++;
}
}
+ if (document.getElementById('confirm_removal_'+remidxs[i])) {
+ if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) {
+ removalinfo ++;
+ }
+ }
}
}
}
@@ -6603,12 +6631,17 @@
}
if (doactions == 1) {
if (numchanges > 0) {
- if ((cutwarnings > 0) || (remwarnings > 0)) {
+ if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) {
if (remwarnings > 0) {
if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) {
return false;
}
}
+ if (removalinfo > 0) {
+ if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) {
+ return false;
+ }
+ }
if (cutwarnings > 0) {
if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) {
return false;
More information about the LON-CAPA-cvs
mailing list