--- loncom/interface/loncreateuser.pm 2017/01/28 21:35:49 1.433
+++ loncom/interface/loncreateuser.pm 2017/03/26 22:11:54 1.436
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.433 2017/01/28 21:35:49 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.436 2017/03/26 22:11:54 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -755,6 +755,7 @@ sub print_username_entry_form {
}
} else {
my $actiontext = $lt{'srad'};
+ my $fixeddom;
if ($env{'form.action'} eq 'singlestudent') {
if ($crstype eq 'Community') {
$actiontext = $lt{'srme'};
@@ -763,6 +764,7 @@ sub print_username_entry_form {
}
} elsif ($env{'form.action'} eq 'accesslogs') {
$actiontext = $lt{'srva'};
+ $fixeddom = 1;
} elsif (($env{'form.action'} eq 'singleuser') &&
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) {
$actiontext = $lt{'srvu'};
@@ -774,7 +776,7 @@ sub print_username_entry_form {
'
');
}
}
- $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1));
+ $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom));
}
}
@@ -7207,7 +7209,7 @@ sub print_helpdeskaccess_display {
my $confname = $cdom.'-domainconfig';
my $crstype = &Apache::loncommon::course_type();
- my @accesstypes = ('all','anydh','anyda','none');
+ my @accesstypes = ('all','dh','da','none');
my ($numstatustypes,@jsarray);
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
if (ref($types) eq 'ARRAY') {
@@ -7417,8 +7419,8 @@ ENDJS
'whi' => 'Which helpdesk personnel may use this role?',
'udd' => 'Use domain default',
'all' => 'All with domain helpdesk or helpdesk assistant role',
- 'anydh' => 'All with domain helpdesk role',
- 'anyda' => 'All with domain helpdesk assistant role',
+ 'dh' => 'All with domain helpdesk role',
+ 'da' => 'All with domain helpdesk assistant role',
'none' => 'None',
'status' => 'Determined based on institutional status',
'inc' => 'Include all, but exclude specific personnel',
@@ -7661,9 +7663,9 @@ sub domain_adhoc_access {
}
} elsif ($access eq 'none') {
$domusage{$role} = &mt('No one in the domain');
- } elsif ($access eq 'anydh') {
+ } elsif ($access eq 'dh') {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
- } elsif ($access eq 'anyda') {
+ } elsif ($access eq 'da') {
$domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da'));
} elsif ($access eq 'all') {
$domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
@@ -7852,7 +7854,7 @@ sub update_helpdeskaccess {
$r->print('
'.&mt('You do not have permission to change helpdesk access.').'
'); return; } - my @accesstypes = ('all','anydh','anyda','none','status','inc','exc'); + my @accesstypes = ('all','dh','da','none','status','inc','exc'); my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $confname = $cdom.'-domainconfig'; @@ -8103,10 +8105,10 @@ sub update_helpdeskaccess { if ($env{'form.'.$role.'_incrs'}) { if ($newsettings{$role}{'access'} eq 'all') { $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); - } elsif ($newsettings{$role}{'access'} eq 'anydh') { + } elsif ($newsettings{$role}{'access'} eq 'dh') { $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', &Apache::lonnet::plaintext('dh'))); - } elsif ($newsettings{$role}{'access'} eq 'anyda') { + } elsif ($newsettings{$role}{'access'} eq 'da') { $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', &Apache::lonnet::plaintext('da'))); } elsif ($newsettings{$role}{'access'} eq 'none') { @@ -8224,7 +8226,7 @@ sub user_search_result { my $domd_chk = &domdirectorysrch_check($srch); $response .= ''.$instd_chk.'