[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface slotrequest.pm
raeburn
raeburn at source.lon-capa.org
Wed Jun 27 10:26:29 EDT 2018
raeburn Wed Jun 27 14:26:29 2018 EDT
Modified files: (Branch: version_2_11_X)
/loncom/interface slotrequest.pm
Log:
- For 2.11
- Backport 1.138
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.125.2.3 loncom/interface/slotrequest.pm:1.125.2.4
--- loncom/interface/slotrequest.pm:1.125.2.3 Mon Oct 24 01:13:54 2016
+++ loncom/interface/slotrequest.pm Wed Jun 27 14:26:28 2018
@@ -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.125.2.3 2016/10/24 01:13:54 raeburn Exp $
+# $Id: slotrequest.pm,v 1.125.2.4 2018/06/27 14:26:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -841,9 +841,15 @@
if ($slot_name && $slot_name ne $conflictable_slot) {
my %slot=&Apache::lonnet::get_slot($slot_name);
my $description1=&get_description($slot_name,\%slot);
+ my $slottype1=$slot{'type'};
%slot=&Apache::lonnet::get_slot($env{'form.slotname'});
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);
<form method="post" action="/adm/slotrequest">
<input type="hidden" name="symb" value="$env{'form.symb'}" />
More information about the LON-CAPA-cvs
mailing list