appdb/include testData.php

[WineHQ]

ChangeSet ID:	31009
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/03/25 13:58:13

Modified files:
    include        : testData.php

Log message:
    Alexander Nicolaysen Sørnes 
    Only show checked test results in version display

Patch: http://cvs.winehq.org/patch.py?id=31009

Old revision  New revision  Changes     Path
 1.31          1.32          +6 -17      appdb/include/testData.php

Index: appdb/include/testData.php
diff -u -p appdb/include/testData.php:1.31 appdb/include/testData.php:1.32
--- appdb/include/testData.php:1.31	25 Mar 2007 18:58:13 -0000
+++ appdb/include/testData.php	25 Mar 2007 18:58:13 -0000
@@ -380,13 +380,15 @@ class testData{

$sQuery = "SELECT * 
                    FROM testResults
-                   WHERE versionId = '".$this->iVersionId."'
+                   WHERE versionId = '?'
+                   AND
+                   queued = '?'
                    ORDER BY testedDate DESC";
    
         if(!$showAll)
             $sQuery.=" LIMIT 0,".$iDisplayLimit;

-        $hResult = query_appdb($sQuery);
+        $hResult = query_parameters($sQuery, $this->iVersionId, "false");
         if(!$hResult)
             return;

@@ -405,7 +407,7 @@ class testData{
         echo '<td>Installs?</td>',"\n";
         echo '<td>Runs?</td>',"\n";
         echo '<td>Rating</td>',"\n";
-        echo '<td>Status</td>',"\n";
+        echo '<td>Submitter</td>',"\n";
         echo '</tr></thead>',"\n";
         while($oRow = mysql_fetch_object($hResult))
         {
@@ -433,19 +435,6 @@ class testData{
                     echo '">Show</a>]</td>',"\n";
             }

-            switch($oTest->sQueued)
-            {
-                case "false":
-                   $sStatus = "Checked";
-                break;
-                case "true":
-                   $sStatus = "Queued";
-                break;
-                case "rejected":
-                   $sStatus = "Rejected";
-                break;
-            }
-
             echo '    <td>',"\n";
             echo $oDistribution->objectMakeLink()."\n";
             echo '    </td>',"\n";
@@ -454,7 +443,7 @@ class testData{
             echo '    <td>'.$oTest->sInstalls.'&nbsp</td>',"\n";
             echo '    <td>'.$oTest->sRuns.'&nbsp</td>',"\n";
             echo '    <td>'.$oTest->sTestedRating.'&nbsp</td>',"\n";
-            echo '    <td>'.$sStatus.'&nbsp</td>',"\n";
+            echo '    <td>'.$oSubmitter->objectMakeLink().'&nbsp</td>',"\n";
             if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion))
             {
                 $oObject = new objectManager("testData");