version 1.75, 2016/02/20 00:12:39
|
version 1.76, 2016/03/04 21:43:15
|
Line 2557 sub display_loncaparev_constraints {
|
Line 2557 sub display_loncaparev_constraints {
|
if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) { |
if (grep(/^\Q$value\E$/,@{$Apache::lonrelrequtils::checkparms{$item}})) { |
my $stdtype = &Apache::lonparmset::standard_parameter_types($item); |
my $stdtype = &Apache::lonparmset::standard_parameter_types($item); |
$found{$item}{'valname'} = &get_param_description($stdtype,$value); |
$found{$item}{'valname'} = &get_param_description($stdtype,$value); |
$found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.':'}; |
$found{$item}{'rev'} = $Apache::lonnet::needsrelease{'parameter:'.$item.':'.$value.'::'}; |
} |
} |
} |
} |
} |
} |
Line 2570 sub display_loncaparev_constraints {
|
Line 2570 sub display_loncaparev_constraints {
|
my $stdtype = &Apache::lonparmset::standard_parameter_types($item); |
my $stdtype = &Apache::lonparmset::standard_parameter_types($item); |
$found{$item}{'valname'} = &get_param_description($stdtype,$value,1); |
$found{$item}{'valname'} = &get_param_description($stdtype,$value,1); |
$found{$item}{'rev'} = |
$found{$item}{'rev'} = |
$Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch}; |
$Apache::lonnet::needsrelease{'parameter:'.$item.'::'.$valuematch.':'}; |
last; |
last; |
} |
} |
} |
} |
} |
} |
} |
} |
|
foreach my $item (keys(%Apache::lonrelrequtils::checkparmnamesmatch)) { |
|
my $regexp; |
|
if ($item eq 'maplevelrecurse') { |
|
$regexp = '\.(?:sequence|page)___\(rec\)\.'; |
|
} |
|
if ($regexp ne '') { |
|
if ($key =~ /$regexp.*\.(\w+)$/) { |
|
my $name = $1; |
|
my $value = $resourcedata->{$key}; |
|
if ($name eq 'type') { |
|
last unless (($value eq 'problem') || ($value eq 'practice') || ($value eq 'exam') || |
|
($value eq 'survey') || ($value eq 'surveycred') || ($value eq 'anonsurvey') || |
|
($value eq 'anonsurveycred') || ($value eq 'randomizetry') || ($value eq 'library')); |
|
} |
|
my $stdtype = &Apache::lonparmset::standard_parameter_types($name); |
|
$found{$name}{'valname'} = &get_param_description($stdtype,$value); |
|
$found{$name}{'extra'} = &mt('Recursive into sub-folders'); |
|
$found{$name}{'rev'} = |
|
$Apache::lonnet::needsrelease{'parameter::::'.$item}; |
|
} |
|
} |
|
} |
foreach my $item (keys(%found)) { |
foreach my $item (keys(%found)) { |
my $stdname = &Apache::lonparmset::standard_parameter_names($item); |
my $stdname = &Apache::lonparmset::standard_parameter_names($item); |
my $rev = $found{$item}{'rev'}; |
my $rev = $found{$item}{'rev'}; |
my $valname = $found{$item}{'valname'}; |
my $valname = $found{$item}{'valname'}; |
|
my $extra = $found{$item}{'extra'}; |
my ($middle,$scope,$which,$level,$map,$resource); |
my ($middle,$scope,$which,$level,$map,$resource); |
my $start = $cid.'.'; |
my $start = $cid.'.'; |
if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) { |
if ($key =~ /^\Q$start\E(\[useropt\:($match_username\:$match_domain)\]\.)/) { |
Line 2594 sub display_loncaparev_constraints {
|
Line 2617 sub display_loncaparev_constraints {
|
$scope = 'all'; |
$scope = 'all'; |
} |
} |
my $what="$stdname=$valname"; |
my $what="$stdname=$valname"; |
|
if ($extra) { |
|
$what .= "<br/>$extra<br />"; |
|
} |
if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) { |
if ($key =~ /^\Q$start$middle\E\w+\.\Q$item\E$/) { |
$level = 'general'; |
$level = 'general'; |
if ($scope eq 'all') { |
if ($scope eq 'all') { |
Line 2614 sub display_loncaparev_constraints {
|
Line 2640 sub display_loncaparev_constraints {
|
} |
} |
} |
} |
$rowspan{$rev} ++; |
$rowspan{$rev} ++; |
} elsif ($key =~ /^\Q$start$middle\E(.+)___\(all\).\w+\.\Q$item\E$/) { |
} elsif ($key =~ /^\Q$start$middle\E(.+)___\((all|rec)\).\w+\.\Q$item\E$/) { |
$level = 'folder'; |
$level = 'folder'; |
$map = $1; |
$map = $1; |
if ($scope eq 'all') { |
if ($scope eq 'all') { |
Line 2769 sub display_loncaparev_constraints {
|
Line 2795 sub display_loncaparev_constraints {
|
|
|
if (defined($navmap)) { |
if (defined($navmap)) { |
my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum); |
my %anonsubms=&Apache::lonnet::dump('nohist_anonsurveys',$cdom,$cnum); |
my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey:'}; |
my $rev_anonsurv=$Apache::lonnet::needsrelease{'parameter:type:anonsurvey::'}; |
my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum); |
my %randtrysubms=&Apache::lonnet::dump('nohist_randomizetry',$cdom,$cnum); |
my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry:'}; |
my $rev_randtry=$Apache::lonnet::needsrelease{'parameter:type:randomizetry::'}; |
my $stdtype=&Apache::lonparmset::standard_parameter_types('type'); |
my $stdtype=&Apache::lonparmset::standard_parameter_types('type'); |
my $stdname=&Apache::lonparmset::standard_parameter_names('type'); |
my $stdname=&Apache::lonparmset::standard_parameter_names('type'); |
my $valanon=&get_param_description($stdtype,'anonsurvey'); |
my $valanon=&get_param_description($stdtype,'anonsurvey'); |
Line 3106 sub get_param_description {
|
Line 3132 sub get_param_description {
|
if (ref($paramstrings) eq 'ARRAY') { |
if (ref($paramstrings) eq 'ARRAY') { |
@possibles = @{$paramstrings}; |
@possibles = @{$paramstrings}; |
} else { |
} else { |
|
if (($stdtype eq 'date_start') || ($stdtype eq 'date_end')) { |
|
if ($name == 0) { |
|
$name = &mt('Never'); |
|
} elsif (($name ne '') && ($name !~ /\D/)) { |
|
$name = &Apache::lonlocal::locallocaltime($name); |
|
} |
|
} |
return $name; |
return $name; |
} |
} |
} |
} |