[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm
raeburn
raeburn at source.lon-capa.org
Wed Aug 7 22:18:50 EDT 2013
raeburn Thu Aug 8 02:18:50 2013 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface londocs.pm
Log:
- For 2.11
- Backport 1.556 (part), 1.557.
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.36 loncom/interface/londocs.pm:1.484.2.37
--- loncom/interface/londocs.pm:1.484.2.36 Sat Aug 3 18:16:46 2013
+++ loncom/interface/londocs.pm Thu Aug 8 02:18:50 2013
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.484.2.36 2013/08/03 18:16:46 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.37 2013/08/08 02:18:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,7 @@
my %alreadyseen=();
my $hadchanges;
+my $suppchanges;
my %help=();
@@ -79,7 +80,11 @@
$map,1,$report);
if ($errtext) { return ($errtext,2); }
- $hadchanges=1;
+ if ($map =~ /^default/) {
+ $hadchanges=1;
+ } else {
+ $suppchanges=1;
+ }
return ($errtext,0);
}
@@ -402,6 +407,11 @@
}
my ($errtext,$fatal) =
&storemap($coursenum, $coursedom, $folder.'.'.$container,1);
+ unless ($fatal) {
+ if ($folder =~ /^supplemental/) {
+ &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+ }
+ }
return ($errtext,$fatal,$fixuperrors);
}
@@ -4707,7 +4717,7 @@
<input type="hidden" name="importdetail"
value="$lt{'rost'}=/adm/viewclasslist" />
<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
- $help{'Course Roster'}
+ $help{'Course_Roster'}
</form>
NROSTFORM
@@ -4975,6 +4985,18 @@
$supplementalflag,\%suporderhash,$iconpath,$pathitem);
if ($error) {
$r->print('<p><span class="LC_error">'.$error.'</span></p>');
+ } else {
+ if ($suppchanges) {
+ my %servers = &Apache::lonnet::internet_dom_servers($coursedom);
+ my @ids=&Apache::lonnet::current_machine_ids();
+ foreach my $server (keys(%servers)) {
+ next if (grep(/^\Q$server\E$/, at ids));
+ my $hashid=$coursenum.':'.$coursedom;
+ &Apache::lonnet::remote_devalidate_cache($server,'suppcount',$hashid);
+ }
+ &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1);
+ undef($suppchanges);
+ }
}
}
} elsif ($supplementalflag) {
More information about the LON-CAPA-cvs
mailing list