--- loncom/interface/lonblockingmenu.pm 2019/02/06 15:40:22 1.14.2.3.2.1
+++ loncom/interface/lonblockingmenu.pm 2016/10/23 16:17:52 1.23
@@ -2,7 +2,7 @@
# Routines for configuring blocking of access to collaborative functions,
# and specific resources during an exam
#
-# $Id: lonblockingmenu.pm,v 1.14.2.3.2.1 2019/02/06 15:40:22 raeburn Exp $
+# $Id: lonblockingmenu.pm,v 1.23 2016/10/23 16:17:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -527,7 +527,7 @@ sub handler {
$r->print(&Apache::loncourserespicker::create_picker($navmap,
'examblock','resourceblocks',$crstype,
\%blockedmaps,\%blockedresources,
- $env{'form.block'},'','',undef,undef,$readonly));
+ $env{'form.block'},'','',undef,$readonly));
} else {
$r->print($errormsg);
}
@@ -658,19 +658,20 @@ END
&Apache::loncourserespicker::get_navmap_object($crstype,'examblock');
# --------------------------------------------- Interface for adding a new block
- unless ($readonly) {
+ if ($readonly) {
+ if (!$blockcount) {
+ $r->print($lt{'ncbc'}.'
');
+ }
+ } else {
&display_addblocker_table($r,$blockcount,\%ltext,\%intervals,
$navmap,$errormsg);
if ($blockcount > 0) {
$r->print('');
}
}
+
# ------------------------------------------------ Interface for existing blocks
- if (!$blockcount) {
- if ($readonly) {
- $r->print($lt{'ncbc'}.'
');
- }
- } else {
+ if ($blockcount > 0) {
&display_blocker_status($r,\%records,\%ltext,\%intervals,
$navmap,$errormsg,$blockcount,$readonly);
}