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

[raeburn]

raeburn		Tue Oct  2 19:38:01 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - For 2.11.
    - Backport 1.172, 1.173.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.160.6.7 loncom/interface/domainprefs.pm:1.160.6.8
--- loncom/interface/domainprefs.pm:1.160.6.7	Tue Sep 25 23:20:42 2012
+++ loncom/interface/domainprefs.pm	Tue Oct  2 19:38:00 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.160.6.7 2012/09/25 23:20:42 raeburn Exp $
+# $Id: domainprefs.pm,v 1.160.6.8 2012/10/02 19:38:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1686,9 +1686,7 @@
         } elsif ($context eq 'requestauthor') {
             my $curroption;
             if (ref($settings) eq 'HASH') {
-                if (ref($settings->{'requestauthor'}) eq 'HASH') {
-                    $curroption = $settings->{'requestauthor'};
-                }
+                $curroption = $settings->{'default'};
             }
             if (!$curroption) {
                 $curroption = 'norequest';
@@ -1833,8 +1831,8 @@
                     $checked = ' checked="checked"';
                 }
                 $datatable .= '<span class="LC_nobreak"><label>'.
-                              '<input type="radio" name="crsreq_'.$item.
-                              '__LC_adv" value="'.$val.'"'.$checked.' />'.
+                              '<input type="radio" name="authorreq__LC_adv"'.
+                              ' value="'.$val.'"'.$checked.' />'.
                               $titles{$option}.'</label></span>  ';
             }
         } else {
@@ -5906,6 +5904,10 @@
                                         $cond = $conditions{$inconf{$type}};
                                     }
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1].',$typetitle).' '.$cond.'</li>';
+                                } elsif ($context eq 'requestauthor') {
+                                    $resulttext .= '<li>'.&mt('Set to "[_1]" for "[_2]".',
+                                                             $titles{$inconf{$type}},$typetitle);
+
                                 } else {
                                     $resulttext .= '<li>'.&mt('Set to be available to [_1]',$typetitle).'</li>';
                                 }