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

[raeburn]

raeburn		Sat May 22 01:11:54 2010 EDT

  Modified files:              
    /loncom/interface	lonuserutils.pm 
  Log:
  - Eliminate duplicate declaration.
  - Fix typo in string displayed in javascript alert.
  - Additional check for addsec in setSections() js function.
  
  
Index: loncom/interface/lonuserutils.pm
diff -u loncom/interface/lonuserutils.pm:1.118 loncom/interface/lonuserutils.pm:1.119
--- loncom/interface/lonuserutils.pm:1.118	Sun Mar 21 14:58:40 2010
+++ loncom/interface/lonuserutils.pm	Sat May 22 01:11:53 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.118 2010/03/21 14:58:40 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.119 2010/05/22 01:11:53 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4395,7 +4395,6 @@
     my ($r,$context,$setting,$choice,$crstype) = @_;
     my $now = time;
     my $count=0;
-    my $crstype;
     if ($context eq 'course') {
         $crstype = &Apache::loncommon::course_type();
     }
@@ -4936,7 +4935,7 @@
                     accr => 'A course coordinator role will be added with access to all sections.',
                     acor => 'A coordinator role will be added with access to all sections',
                     inea => 'In each course, each user may only have one student role at a time.',
-                    inec => 'In each community, each user may only have on member role at a time.',
+                    inec => 'In each community, each user may only have one member role at a time.',
                     youh => 'You had selected ',
                     secs => 'sections.',
                     plmo => 'Please modify your selections so they include no more than one section.',
@@ -4974,7 +4973,7 @@
                     for (var j=0; j<formname.elements[num].length; j++) {
                         if (formname.elements[num].options[j].selected == true ) {
                             var addsec = formname.elements[num].options[j].value;
-                            if (addsec != "") {
+                            if ((addsec != "") && (addsec != null)) {
                                 fromexisting.push(addsec);
                                 if (numsec == 0) {
                                     sections = addsec;