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

[raeburn]

raeburn		Mon Jan 23 22:46:44 2017 EDT

  Modified files:              
    /loncom/interface	domainprefs.pm 
  Log:
  - Delay looping over @mailings array until populated.
  - Wording change in message displayed when no changes made to e-mail contacts
    or helpdesk form settings.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.287 loncom/interface/domainprefs.pm:1.288
--- loncom/interface/domainprefs.pm:1.287	Sun Jan 22 13:26:32 2017
+++ loncom/interface/domainprefs.pm	Mon Jan 23 22:46:44 2017
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.287 2017/01/22 13:26:32 raeburn Exp $
+# $Id: domainprefs.pm,v 1.288 2017/01/23 22:46:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2958,9 +2958,6 @@
     my @contacts = ('adminemail','supportemail');
     my (%checked,%to,%otheremails,%bccemails,%includestr,%includeloc,%currfield,
         $maxsize,$fields,$fieldtitles,$fieldoptions,$possoptions, at mailings);
-    foreach my $type (@mailings) {
-        $otheremails{$type} = '';
-    }
     if ($position eq 'top') {
         if (ref($settings) eq 'HASH') {
             foreach my $item (@contacts) {
@@ -2972,8 +2969,14 @@
     } elsif ($position eq 'middle') {
         @mailings = ('errormail','packagesmail','lonstatusmail','requestsmail',
                      'updatesmail','idconflictsmail');
+        foreach my $type (@mailings) {
+            $otheremails{$type} = '';
+        }
     } else {
         @mailings = ('helpdeskmail','otherdomsmail');
+        foreach my $type (@mailings) {
+            $otheremails{$type} = '';
+        }
         $bccemails{'helpdeskmail'} = '';
         $bccemails{'otherdomsmail'} = '';
         $includestr{'helpdeskmail'} = '';
@@ -10650,7 +10653,7 @@
             }
             $resulttext .= '</ul>';
         } else {
-            $resulttext = &mt('No changes made to contact information');
+            $resulttext = &mt('No changes made to contacts and form settings');
         }
     } else {
         $resulttext = '<span class="LC_error">'.