--- loncom/interface/lonparmset.pm 2017/02/16 18:17:49 1.572
+++ loncom/interface/lonparmset.pm 2017/07/13 13:57:48 1.577
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.572 2017/02/16 18:17:49 damieng Exp $
+# $Id: lonparmset.pm,v 1.577 2017/07/13 13:57:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1543,7 +1543,7 @@ sub print_td {
if ($readonly) {
$nolink = 1;
} else {
- if ($which == 14 || $which == 15) {
+ if ($which == 14 || $which == 15 || $mprefix =~ /mapalias\&/) {
$nolink = 1;
} elsif (($env{'request.course.sec'} ne '') && ($which > 12)) {
$nolink = 1;
@@ -1559,11 +1559,15 @@ sub print_td {
unless ($which == 2) {
$nolink = 1;
}
+ } elsif ($mprefix =~ /(encrypturl|hiddenresource)/) {
+ if ($which == 16 || $which == 10 || $which == 6 || $which == 2) {
+ $nolink = 1;
+ }
}
}
if ($nolink) {
- $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$mprefix));
-# FIXME: probably a good thing that mprefix is not used in valout, because it does not look like a parameter name !
+ my ($parmname)=((split(/\&/,$mprefix))[1]=~/\_([^\_]+)$/);
+ $r->print(&valout($$outpar[$which],$$typeoutpar[$which],$parmname));
} else {
$r->print(&plink($$typeoutpar[$which],
$$display{$value},$$outpar[$which],
@@ -1935,7 +1939,7 @@ sub lookUpTableParameter {
'retrypartial' => 'tries',
'discussvote' => 'misc',
'examcode' => 'high_level_randomization',
- );
+ );
}
# Adds the given parameter name to an array of arrays listing all parameters for each category.
@@ -2029,6 +2033,7 @@ sub parmboxes {
$r->print('
'
.'
'.&mt($categories{$key}).'
'."\n");
foreach my $tempkey (&keysindisplayorderCategory($categoryList{$key},$keyorder)) {
+ next if ($tempkey eq '');
$r->print('
'
.'