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

[raeburn]

raeburn		Tue Dec 28 00:01:45 2004 EDT

  Modified files:              
    /loncom/interface	loncreateuser.pm 
  Log:
  Only call lonnet::get_sections for current course.  If there is a single section, use a single item select box (an attempt to minimize possible confusion over how to select the section).
  
  
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.91 loncom/interface/loncreateuser.pm:1.92
--- loncom/interface/loncreateuser.pm:1.91	Mon Dec  6 19:49:27 2004
+++ loncom/interface/loncreateuser.pm	Tue Dec 28 00:01:44 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.91 2004/12/07 00:49:27 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.92 2004/12/28 05:01:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1280,13 +1280,13 @@
                &mt('Add to classlist').': <b>ok</b><br />';
         }
     } else {
-        $output = (&mt('Assigning').' '.$three.' in '.$url.
+        $output = &mt('Assigning').' '.$three.' in '.$url.
                ($start?', '.&mt('starting').' '.localtime($start):'').
                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
                &Apache::lonnet::assignrole(
                    $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
                    $url,$three,$end,$start).
-                   '</b><br>');
+                   '</b><br>';
     }
     return $output;
 }
@@ -1611,7 +1611,12 @@
 	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
 	my ($domain,$cnum)=split(/\//,$thiscourse);
         my %sections_count = ();
-        my $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+        my $num_sections = 0;
+        if (defined($ENV{'request.course.id'})) {
+            if ($ENV{'request.course.id'} eq $domain.'_'.$cnum) {
+                $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
+            }
+        }
 	foreach  ('st','ta','ep','ad','in','cc') {
 	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($_);
@@ -1706,12 +1711,18 @@
     my ($num_sections,$sections_count,$role) = @_;
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    $output = '<select name="currsec_'.$role.'" ';
-    my $multiple = 4;
-    if ($num_sections <4) { $multiple = $num_sections; }
-    $output .= '"multiple size="'.$multiple.'" >'."\n";
-    foreach (@sections) {
-        $output .= '<option value="'.$_.'" />'.$_."\n";
+    if ($num_sections == 1) {
+        $output = '<select name="currsec_'.$role.'" >'."\n".
+                  '  <option value="">Select</option>'."\n".
+                  '  <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n";
+    } else {
+        $output = '<select name="currsec_'.$role.'" ';
+        my $multiple = 4;
+        if ($num_sections <4) { $multiple = $num_sections; }
+        $output .= '"multiple size="'.$multiple.'" >'."\n";
+        foreach (@sections) {
+            $output .= '<option value="'.$_.'">'.$_."</option>\n";
+        }
     }
     $output .= '</select>'; 
     return $output;