--- loncom/interface/loncreateuser.pm	2017/01/28 02:56:41	1.431
+++ loncom/interface/loncreateuser.pm	2017/01/28 03:48:44	1.432
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.431 2017/01/28 02:56:41 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.432 2017/01/28 03:48:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7218,7 +7218,7 @@ sub print_helpdeskaccess_display {
         }
     }
     my %customroles = &get_domain_customroles($cdom,$confname);
-    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
     if (keys(%domhelpdesk)) {
        push(@accesstypes,('inc','exc'));
        push(@jsarray,('notinc','notexc'));
@@ -7603,7 +7603,8 @@ sub domain_adhoc_access {
             my $access = $domcurrent->{$role}{'access'};
             if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) {
                 $access = 'all';
-                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+                $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'),
+                                                                                          &Apache::lonnet::plaintext('da'));
             } elsif ($access eq 'status') {
                 if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') {
                     my @shown;
@@ -7619,8 +7620,8 @@ sub domain_adhoc_access {
                     }
                     if (@shown) {
                         my $shownstatus = join(' '.&mt('or').' ',@shown);
-                        $domusage{$role} = &mt('Any user in domain with active [_1] role, and institutional status: [_2]',
-                                               &Apache::lonnet::plaintext('dh'),$shownstatus);
+                        $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus);
                     } else {
                         $domusage{$role} = &mt('No one in the domain');
                     }
@@ -7634,10 +7635,11 @@ sub domain_adhoc_access {
                     }
                     my $showninc = join(', ',@dominc);
                     if ($showninc ne '') {
-                        $domusage{$role} = &mt('Include any user in domain with active [_1] role, except: [_2]',
-                                               &Apache::lonnet::plaintext('dh'),$showninc);
+                        $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc);
                     } else {
-                        $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+                        $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                               &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
                     }
                 }
             } elsif ($access eq 'exc') {
@@ -7650,18 +7652,20 @@ sub domain_adhoc_access {
                 }
                 my $shownexc = join(', ',@domexc);
                 if ($shownexc ne '') {
-                    $domusage{$role} = &mt('Only the following in the domain with active [_1] role: [_2]',
-                                           &Apache::lonnet::plaintext('dh'),$shownexc);
+                    $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]',
+                                           &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc);
                 } else {
                     $domusage{$role} = &mt('No one in the domain');
                 }
             } elsif ($access eq 'none') {
                 $domusage{$role} = &mt('No one in the domain');
             } elsif ($access eq 'all') {
-                $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+                $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                       &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
             }
         } else {
-            $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh'));
+            $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',
+                                   &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'));
         }
     }
     return %domusage;
@@ -7852,7 +7856,7 @@ sub update_helpdeskaccess {
     my (%settings,%overridden);
     &get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
                             $types,\%customroles,\%settings,\%overridden);
-    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh']);
+    my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
     my (%changed,%storehash,@todelete);
 
     if (keys(%customroles)) {