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

[raeburn]

raeburn		Mon Feb  1 15:58:41 2021 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Move rows in configuration for "Nightly status check e-mail" for thresholds
    for e-mail to admin(s) and e-mail to developers next to each other.
  - Wording change
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.377 loncom/interface/domainprefs.pm:1.378
--- loncom/interface/domainprefs.pm:1.377	Sat Jan 30 21:47:44 2021
+++ loncom/interface/domainprefs.pm	Mon Feb  1 15:58:41 2021
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.377 2021/01/30 21:47:44 raeburn Exp $
+# $Id: domainprefs.pm,v 1.378 2021/02/01 15:58:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3781,18 +3781,17 @@
                                                    \%choices,$rownum);
         $datatable .= $reports;
     } elsif ($position eq 'lower') {
-        $css_class = $rownum%2?' class="LC_odd_row"':'';
-        my ($threshold,$sysmail,%excluded,%weights);
+        my (%current,%excluded,%weights);
         my ($defaults,$names) = &Apache::loncommon::lon_status_items();
         if ($lonstatus{'threshold'} =~ /^\d+$/) {
-            $threshold = $lonstatus{'threshold'};
+            $current{'errorthreshold'} = $lonstatus{'threshold'};
         } else {
-            $threshold = $defaults->{'threshold'};
+            $current{'errorthreshold'} = $defaults->{'threshold'};
         }
         if ($lonstatus{'sysmail'} =~ /^\d+$/) {
-            $sysmail = $lonstatus{'sysmail'};
+            $current{'errorsysmail'} = $lonstatus{'sysmail'};
         } else {
-            $sysmail = $defaults->{'sysmail'};
+            $current{'errorsysmail'} = $defaults->{'sysmail'};
         }
         if (ref($lonstatus{'weights'}) eq 'HASH') {
             foreach my $type ('E','W','N','U') {
@@ -3812,13 +3811,16 @@
                 map {$excluded{$_} = 1; } @{$lonstatus{'excluded'}};
             }
         }
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      $titles->{'errorthreshold'}.
-                      '</span></td><td class="LC_left_item">'.
-                      '<input type="text" name="errorthreshold" value="'.
-                      $threshold.'" size="5" /></td></tr>';
-        $rownum ++;
+        foreach my $item ('errorthreshold','errorsysmail') { 
+            $css_class = $rownum%2?' class="LC_odd_row"':'';
+            $datatable .= '<tr'.$css_class.'>'.
+                          '<td class="LC_left_item"><span class="LC_nobreak">'.
+                          $titles->{$item}.
+                          '</span></td><td class="LC_left_item">'.
+                          '<input type="text" name="'.$item.'" value="'.
+                          $current{$item}.'" size="5" /></td></tr>';
+            $rownum ++;
+        }
         $css_class = $rownum%2?' class="LC_odd_row"':'';
         $datatable .= '<tr'.$css_class.'>'.
                       '<td class="LC_left_item">'.
@@ -3864,14 +3866,6 @@
         }
         $datatable .= '</tr></table></td></tr>';
         $rownum ++;
-        $css_class = $rownum%2?' class="LC_odd_row"':'';
-        $datatable .= '<tr'.$css_class.'>'.
-                      '<td class="LC_left_item"><span class="LC_nobreak">'.
-                      $titles->{'errorsysmail'}.
-                      '</span></td><td class="LC_left_item">'.
-                      '<input type="text" name="errorsysmail" value="'.
-                      $sysmail.'" size="5" /></td></tr>';
-        $rownum ++;
     } elsif ($position eq 'bottom') {
         my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
         my (@posstypes,%usertypeshash);
@@ -8350,8 +8344,8 @@
                    'updatesmail'     => 'E-mail from nightly check of LON-CAPA module integrity/updates',
                    'idconflictsmail' => 'E-mail from bi-nightly check for multiple users sharing same student/employee ID',
                    'hostipmail'      => 'E-mail from nightly check of hostname/IP network changes',
-                   'errorthreshold'  => 'Error/warning threshold for status e-mail',
-                   'errorsysmail'    => 'Error threshold for e-mail to core group',
+                   'errorthreshold'  => 'Error count threshold for status e-mail to admin(s)',
+                   'errorsysmail'    => 'Error count threshold for e-mail to developer group',
                    'errorweights'    => 'Weights used to compute error count',
                    'errorexcluded'   => 'Servers with unsent updates excluded from count',
                  );