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
877
		return "";
877
		return "";
6
878
878
7
879
	$laptopnameitem=array();
879
	$laptopnameitem=array();
10
880
	for ($i = 0;$i < 2; $i++)
880
	$laptopnameitem[0]=qatracker_getlaptopmake(db_fetch_object($laptop_settings)->value);
11
881
		array_push($laptopnameitem,db_fetch_object($laptop_settings)->value);
881
	$laptopmodel=db_fetch_object($laptop_settings)->value;
12
882
13
883
	if (substr($laptopmodel,0,2)=='HP')
14
884
   		$laptopnameitem[1]=substr($laptopmodel,2);
15
885
	else
16
886
		$laptopnameitem[1]=$laptopmodel;
17
882
887
18
883
	$laptopname=implode(" ",$laptopnameitem);
888
	$laptopname=implode(" ",$laptopnameitem);
19
884
	$content.="<h1>".$laptopname."</h1><br \>";
889
	$content.="<h1>".$laptopname."</h1><br \>";
20
@@ -974,7 +979,7 @@
21
974
		$content.=" <tr class=\"block".$productID."".$countv."\" style=\"display:none;\">
979
		$content.=" <tr class=\"block".$productID."".$countv."\" style=\"display:none;\">
22
975
				<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>";
980
				<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
976
		foreach($milestones as $build => $milestone) {
981
		foreach($milestones as $build => $milestone) {
25
977
			$results=db_fetch_object(db_query("SELECT result,comment FROM qatracker_result WHERE reporterid='".$reporterID."' AND buildid='".$build."' AND testcaseid='".$testcase->id."'"));
982
			$results=db_fetch_object(db_query("SELECT id,result,comment FROM qatracker_result WHERE reporterid='".$reporterID."' AND buildid='".$build."' AND testcaseid='".$testcase->id."'"));
26
978
			if ($results->result != null) {
983
			if ($results->result != null) {
27
979
				$content.="<td style=\"text-align:center;\">";
984
				$content.="<td style=\"text-align:center;\">";
28
980
				if ($results->comment != null) {
985
				if ($results->comment != null) {
29
@@ -996,7 +1001,7 @@
30
996
                                                                <img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/started.png\" alt=\"spacer\" /></a></div>";
1001
                                                                <img style=\"margin-bottom:0px;\" src=\"$base_url/modules/qatracker/images/started.png\" alt=\"spacer\" /></a></div>";
31
997
					break;
1002
					break;
32
998
				}
1003
				}
34
999
				$content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, 0)."<br \></td>";
1004
				$content.="&nbsp;".qatracker_getbugslist($build, $testcase->id, $results->id)."<br \></td>";
35
1000
			}
1005
			}
36
1001
			else
1006
			else
37
1002
				$content.="<td cellpadding=\"10\" style=\"text-align:center;font-size:10px;\">
1007
				$content.="<td cellpadding=\"10\" style=\"text-align:center;font-size:10px;\">
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu QA Website Developers		2011-04-07	Pending
Review via email: mp+56814@code.launchpad.net