| '. ''. - &valout($value,$type).' |
| '); $cnt++; if ($cnt==3) { $r->print(" | |||||||||||||
| + | |||||||||||||
|
Select All Select Common Only |
@@ -997,7 +1128,7 @@ sub partmenu {
}
sub usermenu {
- my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev)=@_;
+ my ($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,$usersgroups)=@_;
my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
&Apache::loncommon::selectstudent_link('parmform','uname','udom');
my $selscript=&Apache::loncommon::studentbrowser_javascript();
@@ -1008,31 +1139,26 @@ sub usermenu {
'oi' => "or ID",
'ad' => "at Domain"
);
- my %sectionhash=();
my $sections='';
- my $numsec = &Apache::loncommon::get_sections(
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'},
- \%sectionhash);
+ my %sectionhash = &Apache::loncommon::get_sections();
+
my $groups;
- my %grouphash;
- my $numgrp = &Apache::loncommon::coursegroups(
- \%grouphash,
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- if ($numsec > 0) {
+ my %grouphash = &Apache::longroup::coursegroups();
+
+ if (%sectionhash) {
$sections=$lt{'se'}.': ';
}
- if ($numsec && $numgrp && $parmlev ne 'full') {
+ if (%sectionhash && %grouphash && $parmlev ne 'full') {
$sections .= ' or ';
$sections .= qq|
|;
}
- if ($numgrp > 0) {
+
+ if (%grouphash) {
$groups=$lt{'gr'}.': ';
}
@@ -1127,49 +1264,40 @@ sub levelmenu {
sub sectionmenu {
my ($r,$selectedsections)=@_;
- my %sectionhash=();
- my $sections='';
- my $numsec = &Apache::loncommon::get_sections(
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'},
- \%sectionhash);
- if ($numsec) {
- $r->print('\n");
}
sub groupmenu {
my ($r,$selectedgroups)=@_;
- my %grouphash;
- my $numgrp = &Apache::loncommon::coursegroups(
- \%grouphash,
- $env{'course.'.$env{'request.course.id'}.'.domain'},
- $env{'course.'.$env{'request.course.id'}.'.num'});
- if ($numgrp) {
- $r->print('\n");
+ my %grouphash = &Apache::longroup::coursegroups();
+ return if (!%grouphash);
+
+ $r->print('\n");
}
@@ -1294,6 +1422,7 @@ sub assessparms {
my $uhome;
my $csec;
my $cgroup;
+ my @usersgroups = ();
my $coursename=$env{'course.'.$env{'request.course.id'}.'.description'};
@@ -1364,8 +1493,8 @@ sub assessparms {
$id='';
} else {
$message=
- "".&mt("Unknown ID")." '$id' ".
- &mt('at domain')." '$udom'";
+ ''.&mt("Unknown ID")." '$id' ".
+ &mt('at domain')." '$udom'";
}
} else {
$uname=$env{'form.uname'};
@@ -1376,17 +1505,17 @@ sub assessparms {
$uhome=&Apache::lonnet::homeserver($uname,$udom);
if ($uhome eq 'no_host') {
$message=
- "".&mt("Unknown user")." '$uname' ".
- &mt("at domain")." '$udom'";
+ ''.&mt("Unknown user")." '$uname' ".
+ &mt("at domain")." '$udom'";
$uname='';
} else {
$csec=&Apache::lonnet::getsection($udom,$uname,
$env{'request.course.id'});
if ($csec eq '-1') {
- $message="".
+ $message=''.
&mt("User")." '$uname' ".&mt("at domain")." '$udom' ".
- &mt("not in this course")."";
+ &mt("not in this course")."";
$uname='';
$csec=$env{'form.csec'};
$cgroup=$env{'form.cgroup'};
@@ -1396,14 +1525,14 @@ sub assessparms {
$message="\n \n".&mt("Full Name").": ".
$name{'firstname'}.' '.$name{'middlename'}.' '
.$name{'lastname'}.' '.$name{'generation'}.
- " ';
+ " ';
}
- my $grouplist = &Apache::lonnet::get_users_groups(
- $udom,$uname,$env{'request.course.id'});
- if ($grouplist) {
- my @groups = split(/:/,$grouplist);
- @groups = sort(@groups);
- $cgroup = $groups[0];
+ @usersgroups = &Apache::lonnet::get_users_groups(
+ $udom,$uname,$env{'request.course.id'});
+ if (@usersgroups > 0) {
+ unless (grep(/^\Q$cgroup\E$/,@usersgroups)) {
+ $cgroup = $usersgroups[0];
+ }
}
}
}
@@ -1444,7 +1573,7 @@ sub assessparms {
foreach ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {
$r->print('');
+ $env{'form.recent_'.$_}.'" name="recent_'.$_.'" />');
}
if (!$pssymb) {
@@ -1459,12 +1588,13 @@ sub assessparms {
&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
} else {
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
- $r->print(&mt('Specific Resource').": ".$resource.
- ''.
+ my $title = &Apache::lonnet::gettitle($pssymb);
+ $r->print(&mt('Specific Resource: [_1] ([_2])',$title,$resource).
+ ''.
' '.$message.' '); @@ -1486,6 +1616,7 @@ sub assessparms { if ($parmlev eq 'full') { my $coursespan=$csec?8:5; + my $userspan=3; if ($cgroup ne '') { $coursespan += 3; } @@ -1494,7 +1625,10 @@ sub assessparms { $r->print(' | ||||||||||||
| '); $r->print(' | '.&mt('Any User').' | '); if ($uname) { - $r->print(""); + if (@usersgroups > 1) { + $userspan ++; + } + $r->print(' | '); $r->print(&mt("User")." $uname ".&mt('at Domain')." $udom | "); } my %lt=&Apache::lonlocal::texthash( @@ -1516,7 +1650,7 @@ sub assessparms { ); $r->print(<$lt{'csv'} ($csuname $lt{'at'} $csudom) |
+$lt{'csv'} ($csuname $lt{'at'} $csudom) |
||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| $lt{'ic'} | $lt{'rl'} | $lt{'ic'} | @@ -1545,6 +1679,9 @@ ENDTABLEHEADFOUR } if ($uname) { + if (@usersgroups > 1) { + $r->print(''.&mt('Control by other group?').' | '); + } $r->print(''.&mt('general').' | '.&mt('for Enclosing Map or Folder').' | '.&mt('for Resource').' | '); } @@ -1605,16 +1742,17 @@ ENDTABLEHEADFOUR my $totalparms=scalar keys %name; if ($totalparms>0) { my $firstrow=1; - my $title=&Apache::lonnet::gettitle($uri); + my $title=&Apache::lonnet::gettitle($symbp{$rid}); $r->print('|||||||
| '.
join(' / ',split(/\//,$uri)).
' '.
"$title");
+ &Apache::lonnet::clutter($uri).'?symb='.
+ &escape($symbp{$rid}).
+ "', 'metadatafile', '450', '500', 'no', 'yes');\"".
+ " target=\"_self\">$title");
if ($thistitle) {
$r->print(' ('.$thistitle.')');
@@ -1637,7 +1775,7 @@ ENDTABLEHEADFOUR
&print_row($r,$_,\%part,\%name,\%symbp,$rid,\%default,
\%type,\%display,$defbgone,$defbgtwo,
$defbgthree,$parmlev,$uname,$udom,$csec,
- $cgroup);
+ $cgroup,\@usersgroups);
}
}
}
@@ -1811,7 +1949,7 @@ ENDMAPONE
}
if ($csec) {$r->print(&mt("Section")." $csec\n")};
- if ($cgroup) {$r->print(&mt("Group")." $csec\n")};
+ if ($cgroup) {$r->print(&mt("Group")." $cgroup\n")};
$r->print("\n");
#---------------------------------------------------------------- print table
$r->print(' | |||||||||||||