'.
@@ -3297,7 +3473,9 @@ ENDTABLEHEADFOUR
&print_row($r,$item,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,
- $cgroup,\@usersgroups,$noeditgrp,$readonly);
+ $cgroup,\@usersgroups,$noeditgrp,$readonly,
+ \@recurseup,\%maptitles,\%allmaps_inverted,
+ \$numreclinks);
}
}
}
@@ -3343,6 +3521,7 @@ ENDTABLEHEADFOUR
if ($map eq $mapid) {
my $uri=&Apache::lonnet::declutter($uris{$rid});
+
# $r->print("Keys: $keyp{$rid}
\n");
#--------------------------------------------------------------------
@@ -3410,18 +3589,28 @@ ENDTABLEHEADFOUR
$r->print(''.&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()
.' '.&mt('Parameter Name').' | '
- .''.&mt('Recursive Value').' | '
- .''.&mt('Non-Recursive Value').' | '
+ .''.&mt('Value').' | '
.''.&mt('Parameter in Effect').' | '
.&Apache::loncommon::end_data_table_header_row()
);
+ my $navmap = Apache::lonnavmaps::navmap->new();
+ my @recurseup;
+ if (ref($navmap)) {
+ my $mapres = $navmap->getByMapPc($mapid);
+ if (ref($mapres)) {
+ @recurseup = $navmap->recurseup_maps($mapres->src());
+ }
+ }
+
+
foreach my $item (&keysinorder(\%name,\%keyorder)) {
$r->print(&Apache::loncommon::start_data_table_row());
&print_row($r,$item,\%part,\%name,\%symbp,$mapid,\%default,
\%type,\%display,$defbgone,$defbgtwo,$defbgthree,
$parmlev,$uname,$udom,$csec,$cgroup,'',$noeditgrp,
- $readonly);
+ $readonly,\@recurseup,\%maptitles,\%allmaps_inverted,
+ \$numreclinks);
}
$r->print(&Apache::loncommon::end_data_table().''
.''
@@ -3521,6 +3710,25 @@ ENDMAPONE
} # end of $parmlev eq general
}
$r->print('');
+ if ($numreclinks) {
+ $r->print(<<"END");
+
+
+END
+ }
&endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
} # end sub assessparms
@@ -5050,7 +5258,7 @@ ENDOVER
$r->print('');
$r->print(' ');
- &displaymenu($r,\%allparms,\@pscat,\%keyorder); # FIXME: wrong parameters, could make keysindisplayorderCategory crash because $keyorder is undefined
+ &displaymenu($r,\%allparms,\@pscat,\%keyorder);
$r->print(&Apache::lonhtmlcommon::start_pick_box());
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
my $sectionselector = §ionmenu(\@selected_sections);
@@ -5296,10 +5504,8 @@ ENDOVER
$r->print(&mt('All users'));
} elsif ($data{'scope_type'} eq 'user') {
$r->print(&mt('User: [_1]',join(':',@{$data{'scope'}})));
- } elsif ($data{'scope_type'} eq 'section') {
- $r->print(&mt('Section: [_1]',$data{'scope'}));
- } elsif ($data{'scope_type'} eq 'group') {
- $r->print(&mt('Group: [_1]',$data{'scope'}));
+ } elsif ($data{'scope_type'} eq 'secgroup') {
+ $r->print(&mt('Group/Section: [_1]',$data{'scope'}));
}
$r->print('
');
if ($data{'realm_type'} eq 'all') {
@@ -5406,8 +5612,7 @@ sub parse_key {
$data{'scope_type'} = 'user';
$data{'scope'} = [$1,$2];
} else {
- #FIXME check for group scope
- $data{'scope_type'} = 'section';
+ $data{'scope_type'} = 'secgroup';
}
$middle=~s/^\[(.*)\]//;
}
@@ -5801,16 +6006,17 @@ sub addmetafield {
$r->print('You may undelete previously deleted fields.
Check those you wish to undelete and click Undelete.
');
$r->print('');
}
- $r->print('
Or you may enter a new metadata field name.');
}
- $r->print('');
&endSettingsScreen($r);
}
@@ -6133,17 +6339,13 @@ ENDYESNO
# $issection - section or group name
# $realmdescription - title for the parameter level and resource (without using HTML)
#
-# FIXME: remove unused fields.
-#
# @param {string} $key - parameter log key
# @param {string} $uname - user name
# @param {string} $udom - user domain
-# @param {string} $exeuser - unused
-# @param {string} $exedomain - unused
# @param {boolean} $typeflag - .type log entry
# @returns {Array}
sub components {
- my ($key,$uname,$udom,$exeuser,$exedomain,$typeflag)=@_;
+ my ($key,$uname,$udom,$typeflag)=@_;
if ($typeflag) {
$key=~s/\.type$//;
@@ -6195,7 +6397,7 @@ my %standard_parms_types; # hash paramet
# Reads parameter info from packages.tab into %standard_parms.
sub load_parameter_names {
- open(my $config,"<$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
+ open(my $config,"<","$Apache::lonnet::perlvar{'lonTabDir'}/packages.tab");
while (my $configline=<$config>) {
if ($configline !~ /\S/ || $configline=~/^\#/) { next; }
chomp($configline);
@@ -6358,7 +6560,7 @@ sub parm_change_log {
my $typeflag = ($changed =~/\.type$/ &&
!exists($parmlog{$id}{'logentry'}{$changed.'.type'}));
my ($realm,$section,$parmname,$part,$what,$middle,$uname,$udom,$issection,$realmdescription)=
- &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},undef,undef,$typeflag);
+ &components($changed,$parmlog{$id}{'uname'},$parmlog{$id}{'udom'},$typeflag);
if ($env{'request.course.sec'} ne '') {
next if (($issection ne '') && ($issection ne $env{'request.course.sec'}));
if ($uname ne '') {
|