Francois Gouget : testbot/web: Use GetTaskURL() to link to the task pages.
Alexandre Julliard
julliard at winehq.org
Wed Sep 25 16:21:27 CDT 2019
Module: tools
Branch: master
Commit: 96ddaa8798ff97c700e636f3934abb6c74607792
URL: https://source.winehq.org/git/tools.git/?a=commit;h=96ddaa8798ff97c700e636f3934abb6c74607792
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Sep 25 08:52:13 2019 +0200
testbot/web: Use GetTaskURL() to link to the task pages.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/web/Activity.pl | 4 ++--
testbot/web/Stats.pl | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl
index bf7d6b9..fe056aa 100644
--- a/testbot/web/Activity.pl
+++ b/testbot/web/Activity.pl
@@ -231,9 +231,9 @@ EOF
$Label .= "/64" if ($Bitness);
}
}
- my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No);
+ my $URL = GetTaskURL($VMStatus->{job}->Id, $VMStatus->{step}->No, $VMStatus->{task}->No);
my $Title = $self->escapeHTML($VMStatus->{job}->Remarks);
- $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>";
+ $Label = "<a href='$URL' title='$Title'>$Label</a>";
}
elsif ($VMStatus->{status} eq "dirty")
{
diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl
index 70e812d..91106bb 100644
--- a/testbot/web/Stats.pl
+++ b/testbot/web/Stats.pl
@@ -131,8 +131,7 @@ sub _GetStatHtml($$;$$)
my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey());
if (defined $TaskNo)
{
- my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo);
- return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>";
+ return "<a href='". GetTaskURL($JobId, $StepNo, $TaskNo) ."'>$Value</a>";
}
return "<a href='/index.pl#job$JobId'>$Value</a>";
}
More information about the wine-cvs
mailing list