[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface domainprefs.pm

[raeburn]

raeburn		Mon Jan 30 19:18:34 2017 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - Backport 1.290, 1.291, 1.292.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.78 loncom/interface/domainprefs.pm:1.160.6.79
--- loncom/interface/domainprefs.pm:1.160.6.78	Tue Jan 24 00:19:15 2017
+++ loncom/interface/domainprefs.pm	Mon Jan 30 19:18:33 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.78 2017/01/24 00:19:15 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.79 2017/01/30 19:18:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3088,7 +3088,7 @@
         my $context = 'domprefs';
         my $crstype = 'Course';
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-        my @accesstypes = ('all','none');
+        my @accesstypes = ('all','dh','da','none');
         my ($numstatustypes, at jsarray);
         if (ref($types) eq 'ARRAY') {
             if (@{$types} > 0) {
@@ -3097,7 +3097,7 @@
                 @jsarray = ('bystatus');
             }
         }
-        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']);
+        my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh'.'da']);
         if (keys(%domhelpdesk)) {
             push(@accesstypes,('inc','exc'));
             push(@jsarray,('notinc','notexc'));
@@ -3306,7 +3306,7 @@
                 shown = Array('notinc');
                 hidden = Array('notexc','bystatus');
             }
-            if (curraccess == 'all') {
+            if ((curraccess == 'all') || (curraccess == 'dh') || (curraccess == 'da')) {
                 hidden = Array('notinc','notexc','bystatus');
             }
         }
@@ -3363,7 +3363,9 @@
     my %lt = &Apache::lonlocal::texthash(
                     'rou'    => 'Role usage',
                     'whi'    => 'Which helpdesk personnel may use this role?',
-                    'all'    => 'All',
+                    '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',
@@ -11192,14 +11194,16 @@
     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','none','status','inc','exc');
-    my %domhelpdesk = &Apache::lonnet::get_active_domroles($dom,['dh']);
+    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',
                     d      => 'domain',
                     order  => 'Display order',
                     access => 'Role usage',
-                    all    => 'All',
+                    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',