[LON-CAPA-cvs] cvs: loncom /html/adm/helper newslot.helper

[albertel]

albertel		Tue Mar  7 11:29:14 2006 EDT

  Modified files:              
    /loncom/html/adm/helper	newslot.helper 
  Log:
  - fixing up the code to set the allowed users an allowed sections items
  
  
Index: loncom/html/adm/helper/newslot.helper
diff -u loncom/html/adm/helper/newslot.helper:1.13 loncom/html/adm/helper/newslot.helper:1.14
--- loncom/html/adm/helper/newslot.helper:1.13	Tue Mar  7 11:15:55 2006
+++ loncom/html/adm/helper/newslot.helper	Tue Mar  7 11:29:14 2006
@@ -281,30 +281,24 @@
 	    $slot{'proctor'}=join(',',sort(keys(%proctors)));
 	}
 
-	if ( $helper->{'VARS'}{'allowedsections'} !~/\S/ );
-
-	    my @names;
-	    foreach my $item (split(/\|\|\|/, $helper->{'VARS'}{'allowedsections'})) {
-		my ($uname,$udomain)=split(/:/,$item);
-		push(@names,"$uname:$udomain");
-	    }
-
-	    # make sure the choices are unique
-	    my %proctors = map { ($_,1) } @names;
-	    $slot{'allowedsections'}=join(',',sort(keys(%proctors)));
+        if ( $helper->{'VARS'}{'allowedsections'} =~/\S/ ) {
+	    $slot{'allowedsections'}=
+		join(',',sort(split(/\|\|\|/,
+				    $helper->{'VARS'}{'allowedsections'})));
 	}
 
-        if ( $helper->{'VARS'}{$which} !~/\S/ );
+        if ( $helper->{'VARS'}{'allowedusers'} =~/\S/ ) {
 
 	    my @names;
-	    foreach my $item (split(/\|\|\|/, $helper->{'VARS'}{$which})) {
+	    foreach my $item (split(/\|\|\|/,
+				    $helper->{'VARS'}{'allowedusers'})) {
 		my ($uname,$udomain)=split(/:/,$item);
 		push(@names,"$uname:$udomain");
 	    }
 
 	    # make sure the choices are unique
-	    my %proctors = map { ($_,1) } @names;
-	    $slot{$which}=join(',',sort(keys(%proctors)));
+	    my %users = map { ($_,1) } @names;
+	    $slot{'allowedusers'}=join(',',sort(keys(%users)));
 	}
 
         my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};