--- loncom/homework/bridgetask.pm 2006/12/01 22:53:08 1.213
+++ loncom/homework/bridgetask.pm 2006/12/07 20:44:55 1.214
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.213 2006/12/01 22:53:08 albertel Exp $
+# $Id: bridgetask.pm,v 1.214 2006/12/07 20:44:55 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1577,8 +1577,16 @@ sub show_queue {
my $ekey=&escape($key);
my ($action,$description,$status)=('select',&mt('Select'));
if (exists($queue{"$key\0locked"})) {
+ my $locker = $queue{"$key\0locked"};
+ my $time;
+ if (ref($queue{"$key\0locked"}) eq 'ARRAY') {
+ ($locker, $time) = @{$queue{"$key\0locked"}};
+ $time =
+ &Apache::lonnavmaps::timeToHumanString($time,
+ 'start');
+ }
my $me=$env{'user.name'}.':'.$env{'user.domain'};
- $status=&mt('Locked by [_1]',$queue{"$key\0locked"});
+ $status=&mt('Locked by [_1] [_2]',$locker,$time);
if ($me eq $queue{"$key\0locked"}) {
($action,$description)=('resume',&mt('Resume'));
} else {
@@ -1797,7 +1805,7 @@ sub lock_key {
my (undef,$cid)=&Apache::lonnet::whichuser();
my $cnum=$env{'course.'.$cid.'.num'};
my $cdom=$env{'course.'.$cid.'.domain'};
- my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> $me},
+ my $success=&Apache::lonnet::newput($queue,{"$todo\0locked"=> [$me,time]},
$cdom,$cnum);
&Apache::lonxml::debug("success $success $todo");
if ($success eq 'ok') {