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

[albertel]

albertel		Thu Mar 30 00:20:45 2006 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm 
  Log:
  - forward port 1.48.2.3
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.55 loncom/interface/slotrequest.pm:1.56
--- loncom/interface/slotrequest.pm:1.55	Wed Mar 29 23:35:58 2006
+++ loncom/interface/slotrequest.pm	Thu Mar 30 00:20:44 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.55 2006/03/30 04:35:58 albertel Exp $
+# $Id: slotrequest.pm,v 1.56 2006/03/30 05:20:44 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1142,14 +1142,15 @@
 <a href="/adm/slotrequest?command=delete&slotname=$slot">Delete</a>
 DELETELINK
 
-        my $remove_all=&remove_link($slot,'remove all');
+        my $remove_all=&remove_link($slot,'remove all').'<br />';
 
         if ($ids ne '') { undef($delete); }
-	if ($slots{$slot}{'type'} ne 'schedulable_student') { 
+	if ($slots{$slot}{'type'} ne 'schedulable_student' 
+	    || $ids eq '') { 
 	    undef($remove_all);
 	}
 
-        $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete $remove_all</td>\n");
+        $r->print("<tr>\n<td rowspan=\"$rowspan\">$edit $delete</td>\n");
 	if (exists($show{'name'})) {
 	    $colspan++;$r->print("<td>$slot</td>");
 	}
@@ -1187,7 +1188,7 @@
 	    $colspan++;$r->print("<td>$allowedusers</td>\n");
 	}
 	if (exists($show{'scheduled'})) {
-	    $colspan++;$r->print("<td>$ids</td>\n</tr>\n");
+	    $colspan++;$r->print("<td>$remove_all $ids</td>\n</tr>\n");
 	}
 	if (exists($show{'proctor'})) {
 	    $r->print(<<STUFF);