--- loncom/interface/domainprefs.pm 2017/01/28 21:35:49 1.291 +++ loncom/interface/domainprefs.pm 2017/01/28 23:26:46 1.292 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.291 2017/01/28 21:35:49 raeburn Exp $ +# $Id: domainprefs.pm,v 1.292 2017/01/28 23:26:46 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3250,7 +3250,7 @@ sub print_helpsettings { my $context = 'domprefs'; my $crstype = 'Course'; my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - my @accesstypes = ('all','anydh','anyda','none'); + my @accesstypes = ('all','dh','da','none'); my ($numstatustypes,@jsarray); if (ref($types) eq 'ARRAY') { if (@{$types} > 0) { @@ -3468,7 +3468,7 @@ function helpdeskAccess(num) { shown = Array('notinc'); hidden = Array('notexc','bystatus'); } - if ((curraccess == 'all') || (curraccess == 'anydh') || (curraccess == 'anyda')) { + if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) { hidden = Array('notinc','notexc','bystatus'); } } @@ -3525,9 +3525,9 @@ sub helpdeskroles_access { my %lt = &Apache::lonlocal::texthash( 'rou' => 'Role usage', 'whi' => 'Which helpdesk personnel may use this role?', - 'all' => "All with domain helpdesk or helpdesk assistant role', - 'anydh' => "All with domain helpdesk role', - 'anyda' => "All with domain helpdesk assistant role', + 'all' => 'All with domain helpdesk or 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', @@ -12459,7 +12459,7 @@ sub modify_helpsettings { my %existing=&Apache::lonnet::dump('roles',$dom,$confname,'rolesdef_'); my (@allpos,%newsettings,%changedprivs,$newrole); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - my @accesstypes = ('all','anydh','anyda','none','status','inc','exc'); + my @accesstypes = ('all','dh','da','none','status','inc','exc'); my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh','da']); my %lt = &Apache::lonlocal::texthash( s => 'system', @@ -12467,8 +12467,8 @@ sub modify_helpsettings { order => 'Display order', access => 'Role usage', 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',