[BACK]Return to slotrequest.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/slotrequest.pm between versions 1.125.2.3.2.1 and 1.125.2.6

version 1.125.2.3.2.1, 2017/11/01 02:49:13 version 1.125.2.6, 2018/09/14 21:06:22
Line 744  sub release_reservation { Line 744  sub release_reservation {
                                action  => 'release',                                 action  => 'release',
                                context => $env{'form.context'},                                 context => $env{'form.context'},
                         );                          );
             &Apache::lonnet::write_log('slotreservationslog',\%storehash,              &Apache::lonnet::write_log('course','slotreservationslog',
                                        1,$uname,$udom,$cnum,$cdom);                                         \%storehash,1,$uname,$udom,$cnum,$cdom);
             &Apache::lonnet::write_log($cdom.'_'.$cnum.'_slotlog',\%storehash,              &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',
                                        1,$uname,$udom,$uname,$udom);                                         \%storehash,1,$uname,$udom,$uname,$udom);
  }   }
     }      }
   
Line 841  sub get_slot { Line 841  sub get_slot {
     if ($slot_name && $slot_name ne $conflictable_slot) {      if ($slot_name && $slot_name ne $conflictable_slot) {
  my %slot=&Apache::lonnet::get_slot($slot_name);   my %slot=&Apache::lonnet::get_slot($slot_name);
  my $description1=&get_description($slot_name,\%slot);   my $description1=&get_description($slot_name,\%slot);
           my $slottype1=$slot{'type'};
  %slot=&Apache::lonnet::get_slot($env{'form.slotname'});   %slot=&Apache::lonnet::get_slot($env{'form.slotname'});
  my $description2=&get_description($env{'form.slotname'},\%slot);   my $description2=&get_description($env{'form.slotname'},\%slot);
  if ($slot_name ne $env{'form.slotname'}) {          if ($slottype1 eq 'preassigned') {
               $r->print('<p>'.&mt('You already have a reservation: "[_1]", assigned by your instructor.',
                                   $description1).'</p>'.
                         '<p>'.&mt('Your instructor must unassign it before you can make a new reservation.').
                         '</p>');
           } elsif ($slot_name ne $env{'form.slotname'}) {
     $r->print(<<STUFF);      $r->print(<<STUFF);
 <form method="post" action="/adm/slotrequest">  <form method="post" action="/adm/slotrequest">
    <input type="hidden" name="symb" value="$env{'form.symb'}" />     <input type="hidden" name="symb" value="$env{'form.symb'}" />
Removed from v.1.125.2.3.2.1  
changed lines
  Added in v.1.125.2.6

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>