--- loncom/interface/lonparmset.pm 2006/12/14 20:04:11 1.352
+++ loncom/interface/lonparmset.pm 2007/01/12 20:04:16 1.357
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.352 2006/12/14 20:04:11 albertel Exp $
+# $Id: lonparmset.pm,v 1.357 2007/01/12 20:04:16 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -272,10 +272,8 @@ sub resetrulescache {
sub rulescache {
my $id=shift;
- if ($rulesid ne $env{'request.course.id'}) {
- %rules=();
- }
- unless (defined($rules{$id})) {
+ if ($rulesid ne $env{'request.course.id'}
+ && !defined($rules{$id})) {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
%rules=&Apache::lonnet::dump('parmdefactions',$dom,$crs);
@@ -3290,7 +3288,7 @@ sub order_meta_fields {
{'metadata.addedorder'=>$ordered_fields},$dom,$crs);
&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
}
- my $fields = &get_added_meta_fieldnames();
+ my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
my $ordered_fields;
my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
if (!@fields_in_order) {
@@ -3356,7 +3354,7 @@ sub addmetafield {
'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
$r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
} else {
- my $fields = &get_deleted_meta_fieldnames();
+ my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
if ($fields) {
$r->print('You may undelete previously deleted fields.
Check those you wish to undelete and click Undelete.
');
$r->print('