--- loncom/interface/slotrequest.pm 2009/03/27 11:39:07 1.92
+++ loncom/interface/slotrequest.pm 2009/03/29 17:56:43 1.93
@@ -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.92 2009/03/27 11:39:07 bisitz Exp $
+# $Id: slotrequest.pm,v 1.93 2009/03/29 17:56:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1351,9 +1351,13 @@ LOGLINK
my $remove_all=&remove_link($slot,'remove all').'
';
- if ($ids ne '') { undef($delete); }
- if ($slots{$slot}{'type'} ne 'schedulable_student'
- || $ids eq '') {
+ if ($ids eq '') {
+ undef($remove_all);
+ } else {
+ undef($delete);
+ }
+ if ($slots{$slot}{'type'} ne 'schedulable_student') {
+ undef($showlog);
undef($remove_all);
}
@@ -1748,6 +1752,26 @@ ENDSCRIPT
sub show_reservations_log {
my ($r) = @_;
+ my $badslot;
+ if ($env{'form.slotname'} eq '') {
+ $r->print('
'. + &mt('Return to slot list').'
'); + return; + } my $formname = 'reservationslog'; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; @@ -1810,8 +1834,8 @@ sub show_reservations_log { my %slot=&Apache::lonnet::get_slot($env{'form.slotname'}); my $description = $slot{'description'}; - $r->print(''. + &mt('Return to slot list').'
'); return; } @@ -1964,7 +1990,7 @@ sub display_filter { my ($formname,$cdom,$cnum,$curr,$version,$allsymbs) = @_; my $nolink = 1; my (%titles,%maptitles); - my $output = ''.
+ my $output = '
|