Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b=343919

Browse Source 
- users can now change the status of their own results, and admin can change the status of any result


git-svn-id: svn://10.0.0.236/trunk@209280 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ccooper%deadsquid.com 2006-09-06 17:34:39 +00:00
parent c9a80c76ef
commit c0f8a8d2e4
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mozilla/webtools/litmus/single_result.cgi
View File

@ -44,23 +44,28 @@ print $c->header();
if ($c->param && $c->param('id')) {
my $title = 'Test Result #' . $c->param('id') . ' - Details';
my $vars = {
title => $title,
};
my $result = Litmus::DB::Testresult->retrieve($c->param('id'));
if (!$result) {
internalError("There is no test result corresponding to id#: " . $c->param('id') . ".");
exit 1;
}
my $time = &Date::Manip::UnixDate("now","%q");
my $cookie = Litmus::Auth::getCookie();
my $user;
if ($cookie) {
$user = $cookie->user_id();
if ($user and
$c->param('new_bugs') and
$c->param('new_bugs') ne '') {
my $new_bug_string = $c->param('new_bugs');
$new_bug_string =~ s/[^0-9,]//g;
my @new_bugs = split(/,/,$new_bug_string);
@ -78,7 +83,7 @@ if ($c->param && $c->param('id')) {
}
}
}
if ($user and
$c->param('new_comment') and
$c->param('new_comment') ne '') {
@ -90,7 +95,7 @@ if ($c->param && $c->param('id')) {
comment => $c->param('new_comment'),
});
}
if (Litmus::Auth::istrusted($cookie) and
$c->param('vet_result')) {
if ($c->param('valid')) {
@ -106,14 +111,24 @@ if ($c->param && $c->param('id')) {
$result->last_updated($time);
$result->update;
}
if ((Litmus::Auth::istrusted($cookie) or
$cookie == $result->user_id) and
$c->param('change_result_status') and
$c->param('result_status')) {
# Ignore submission if it doesn't actually change the status.
if ($c->param('result_status') ne $result->result_status->class_name){
my ($new_status) = Litmus::DB::ResultStatus->search(class_name => $c->param('result_status'));
if ($new_status) {
$result->result_status($new_status);
$result->last_updated($time);
$result->update;
}
}
}
}
my $title = 'Test Result #' . $c->param('id') . ' - Details';
my $vars = {
title => $title,
result => $result,
};
$vars->{"result"} = $result;
if ($cookie) {
$vars->{"defaultemail"} = $cookie;

11
mozilla/webtools/litmus/templates/en/default/reporting/result_display.tmpl
View File

@ -47,7 +47,16 @@ Summary Information
<table class="single-result">
<tr class="[% result.result_status.class_name | html %]">
<td width="20%">Status:</td><td>[% result.result_status.name | html %]</td>
<td width="20%">Status:</td><td>
[% IF show_admin OR defaultemail==result.user.user_id %]
<input name="result_status" id="result_status" type="radio" value="pass" [% IF result.result_status.class_name=="pass" %]checked[% END %]> Pass
<input name="result_status" id="result_status" type="radio" value="fail" [% IF result.result_status.class_name=="fail" %]checked[% END %]> Fail
<input name="result_status" id="result_status" type="radio" value="unclear" [% IF result.result_status.class_name=="unclear" %]checked[% END %]> Unclear/Broken&nbsp;
<input id="change_result_status" name="change_result_status" class="button" type="submit" value="Change Result Status">
[% ELSE %]
[% result.result_status.name | html %]
[% END %]
</td>
</tr>
<tr class="even">
<td>Test Summary:</td><td>[% result.testcase.summary | html %]</td>