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

[raeburn]

raeburn		Fri May 23 09:00:23 2014 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11
    - No "Defaults which can be overridden in each course by a CC" available in
      2.11
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.48 loncom/interface/domainprefs.pm:1.160.6.49
--- loncom/interface/domainprefs.pm:1.160.6.48	Fri May 23 08:34:54 2014
+++ loncom/interface/domainprefs.pm	Fri May 23 09:00:22 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.48 2014/05/23 08:34:54 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.49 2014/05/23 09:00:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -412,9 +412,7 @@
         'coursedefaults' => 
                  {text => 'Course/Community defaults',
                   help => 'Domain_Configuration_Course_Defaults',
-                  header => [{col1 => 'Defaults which can be overridden in each course by a CC',
-                              col2 => 'Value',},
-                             {col1 => 'Defaults which can be overridden for each course by a DC',
+                  header => [{col1 => 'Defaults which can be overridden for each course by a DC',
                               col2 => 'Value',},],
                   print => \&print_coursedefaults,
                   modify => \&modify_coursedefaults,
@@ -723,8 +721,7 @@
                 $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
             }
             $rowtotal ++;
-        } elsif (($action eq 'usermodification') || ($action eq 'coursedefaults') ||
-                  ($action eq 'defaults')) {
+        } elsif (($action eq 'usermodification') || ($action eq 'defaults')) {
             $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         } elsif ($action eq 'login') {
             if ($numheaders == 3) {
@@ -865,6 +862,8 @@
             $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal);
         } elsif ($action eq 'helpsettings') {
             $output .= &print_helpsettings($dom,$confname,$settings,\$rowtotal);
+        } elsif ($action eq 'coursedefaults') {
+            $output .= $item->{'print'}->('bottom',$dom,$settings,\$rowtotal);
         }
     }
     $output .= '