version 1.308, 2009/08/19 19:01:04
|
version 1.310, 2009/08/27 13:00:59
|
Line 236 sub build_tools_display {
|
Line 236 sub build_tools_display {
|
'requestcourses.official','requestcourses.unofficial', |
'requestcourses.official','requestcourses.unofficial', |
'requestcourses.community'); |
'requestcourses.community'); |
@usertools = ('official','unofficial','community'); |
@usertools = ('official','unofficial','community'); |
@options =('norequest','approve','autolimit','validate'); |
@options =('norequest','approval','autolimit','validate'); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%reqtitles = &courserequest_titles(); |
%reqtitles = &courserequest_titles(); |
%reqdisplay = &courserequest_display(); |
%reqdisplay = &courserequest_display(); |
Line 371 sub coursereq_externaluser {
|
Line 371 sub coursereq_externaluser {
|
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.community'); |
'reqcrsotherdom.community'); |
@usertools = ('official','unofficial','community'); |
@usertools = ('official','unofficial','community'); |
@options = ('approve','validate','autolimit'); |
@options = ('approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
my $optregex = join('|',@options); |
my $optregex = join('|',@options); |
my %reqtitles = &courserequest_titles(); |
my %reqtitles = &courserequest_titles(); |
Line 432 sub courserequest_titles {
|
Line 432 sub courserequest_titles {
|
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Communities', |
community => 'Communities', |
norequest => 'Not allowed', |
norequest => 'Not allowed', |
approve => 'Approval by Dom. Coord.', |
approval => 'Approval by Dom. Coord.', |
validate => 'With validation', |
validate => 'With validation', |
autolimit => 'Numerical limit', |
autolimit => 'Numerical limit', |
); |
); |
Line 441 sub courserequest_titles {
|
Line 441 sub courserequest_titles {
|
|
|
sub courserequest_display { |
sub courserequest_display { |
my %titles = &Apache::lonlocal::texthash ( |
my %titles = &Apache::lonlocal::texthash ( |
approve => 'Yes, need approval', |
approval => 'Yes, need approval', |
validate => 'Yes, with validation', |
validate => 'Yes, with validation', |
norequest => 'No', |
norequest => 'No', |
); |
); |
Line 2810 sub tool_changes {
|
Line 2810 sub tool_changes {
|
return; |
return; |
} |
} |
if ($context eq 'reqcrsotherdom') { |
if ($context eq 'reqcrsotherdom') { |
my @options = ('approve','validate','autolimit'); |
my @options = ('approval','validate','autolimit'); |
my $optregex = join('|',@options); |
my $optregex = join('|',@options); |
my %reqdisplay = &courserequest_display(); |
my %reqdisplay = &courserequest_display(); |
my $cdom = $env{'request.role.domain'}; |
my $cdom = $env{'request.role.domain'}; |
Line 5235 sub user_search_result {
|
Line 5235 sub user_search_result {
|
&build_search_response($context,$srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
$currstate = 'modify'; |
$currstate = 'modify'; |
|
my $uname = $srch->{'srchterm'}; |
|
my $udom = $srch->{'srchdomain'}; |
|
$srch_results{$uname.':'.$udom} = |
|
{ &Apache::lonnet::get('environment', |
|
['firstname', |
|
'lastname', |
|
'permanentemail'], |
|
$udom,$uname) |
|
}; |
} |
} |
} else { |
} else { |
%srch_results = &Apache::lonnet::usersearch($srch); |
%srch_results = &Apache::lonnet::usersearch($srch); |