Merge lp:~primes2h/ubuntu-qa-website/bug_753862 into lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk

Proposed by Sergio Zanchetta on 2011-04-07
Status: Merged
Merged at revision: 158
Proposed branch: lp:~primes2h/ubuntu-qa-website/bug_753862
Merge into: lp:~ubuntu-qa-website-devel/ubuntu-qa-website/trunk
Diff against target: 37 lines (+9/-4)
1 file modified
code/modules/qatracker/qatracker.display.php (+9/-4)
To merge this branch: bzr merge lp:~primes2h/ubuntu-qa-website/bug_753862
Reviewer Review Type Date Requested Status
Ubuntu QA Website Developers 2011-04-07 Pending
Review via email: mp+56814@code.launchpad.net

Description of the change

Bugs are correctly filtered also by result now. Fixed LP: #753862
High importance fix.

Set automatic name arrangement also in laptop reports.

To post a comment you must log in.
159. By Sergio Zanchetta on 2011-04-13

Set automatic name arrangement also in laptop reports.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'code/modules/qatracker/qatracker.display.php'
2--- code/modules/qatracker/qatracker.display.php 2011-04-04 21:56:54 +0000
3+++ code/modules/qatracker/qatracker.display.php 2011-04-13 08:41:15 +0000
4@@ -877,8 +877,13 @@
5 return "";
6
7 $laptopnameitem=array();
8- for ($i = 0;$i < 2; $i++)
9- array_push($laptopnameitem,db_fetch_object($laptop_settings)->value);
10+ $laptopnameitem[0]=qatracker_getlaptopmake(db_fetch_object($laptop_settings)->value);
11+ $laptopmodel=db_fetch_object($laptop_settings)->value;
12+
13+ if (substr($laptopmodel,0,2)=='HP')
14+ $laptopnameitem[1]=substr($laptopmodel,2);
15+ else
16+ $laptopnameitem[1]=$laptopmodel;
17
18 $laptopname=implode(" ",$laptopnameitem);
19 $content.="<h1>".$laptopname."</h1><br \>";
20@@ -974,7 +979,7 @@
21 $content.=" <tr class=\"block".$productID."".$countv."\" style=\"display:none;\">
22 <td style=\"width=230px;\">&nbsp; <a rel=\"external\" href=\"".$testcase->link."\"><img style=\"margin-bottom:-3px;\" src=\"$base_url/modules/qatracker/images/test.png\" alt=\"spacer\" /></a> ".$title[1]."</td>";
23 foreach($milestones as $build => $milestone) {
24- $results=db_fetch_object(db_query("SELECT result,comment FROM qatracker_result WHERE reporterid='".$reporterID."' AND buildid='".$build."' AND testcaseid='".$testcase->id."'"));
25+ $results=db_fetch_object(db_query("SELECT id,result,comment FROM qatracker_result WHERE reporterid='".$reporterID."' AND buildid='".$build."' AND testcaseid='".$testcase->id."'"));
26 if ($results->result != null) {
27 $content.="<td style=\"text-align:center;\">";
28 if ($results->comment != null) {
29@@ -996,7 +1001,7 @@
30 <img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/started.png\" alt=\"spacer\" /></a></div>";
31 break;
32 }
33- $content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, 0)."<br \></td>";
34+ $content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, $results->id)."<br \></td>";
35 }
36 else
37 $content.="<td cellpadding=\"10\" style=\"text-align:center;font-size:10px;\">

Subscribers

People subscribed via source and target branches

to status/vote changes: