No subject

=3D?utf-8?q?Alexander_Nicolaysen_S=3DC3=3DB8rnes?=3D alex at thehandofag=
Thu Nov 15 09:34:07 CST 2007


ony.com>
Date: Sat, 22 Dec 2007 00:11:55 +0100
Subject: [PATCH] Allow users to delete/edit their queued test reports

---
 include/testData.php |   55 ++++++++++++++++++++++++++++++++++-------------=
--
 1 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/include/testData.php b/include/testData.php
index 022459c..aafeb71 100644
--- a/include/testData.php
+++ b/include/testData.php
@@ -916,30 +916,51 @@ class testData{
     /* List test data submitted by a given user.  Ignore test results for q=
ueued applications/versions */
     function listSubmittedBy($iUserId, $bQueued =3D true)
     {
-        $hResult =3D query_parameters("SELECT testResults.versionId, testRe=
sults.testedDate, testResults.testedRelease, testResults.testedRating, testR=
esults.submitTime, appFamily.appName, appVersion.versionName from testResult=
s, appFamily, appVersion WHERE testResults.versionId =3D appVersion.versionI=
d AND appVersion.appId =3D appFamily.appId  AND testResults.submitterId =3D =
'?' AND testResults.state =3D '?' ORDER BY testResults.testingId", $iUserId,=
 $bQueued ? 'queued' : 'accepted');
+        $hResult =3D query_parameters("SELECT testResults.versionId, testRe=
sults.testedDate, testResults.testedRelease, testResults.testedRating, testR=
esults.submitTime, testResults.testingId, appFamily.appName, appVersion.vers=
ionName from testResults, appFamily, appVersion WHERE testResults.versionId =
=3D appVersion.versionId AND appVersion.appId =3D appFamily.appId  AND testR=
esults.submitterId =3D '?' AND testResults.state =3D '?' ORDER BY testResult=
s.testingId", $iUserId, $bQueued ? 'queued' : 'accepted');
=20
         if(!$hResult || !query_num_rows($hResult))
             return false;
=20
-        $sReturn =3D html_table_begin("width=3D\"100%\" align=3D\"center\""=
);
-        $sReturn .=3D html_tr(array(
-            "Version",
-            "Rating",
-            "Wine version",
-            "Submission Date"),
-            "color4");
+        $oTable =3D new Table();
+        $oTable->SetWidth("100%");
+        $oTable->SetAlign("center");
+
+        // setup the table header
+        $oTableRow =3D new TableRow();
+        $oTableRow->AddTextCell('Version');
+        $oTableRow->AddTextCell('Rating');
+        $oTableRow->AddTextCell('Wine version');
+        $oTableRow->AddTextCell('Submission date');
+
+        if($bQueued)
+            $oTableRow->addTextCell('Action');
+
+        $oTableRow->SetClass('color4');
+        $oTable->AddRow($oTableRow);
=20
         for($i =3D 1; $oRow =3D query_fetch_object($hResult); $i++)
-            $sReturn .=3D html_tr(array(
-                version::fullNameLink($oRow->versionId),
-                $oRow->testedRating,
-                $oRow->testedRelease,
-                print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime=
))),
-                $oRow->testedRating);
+        {
+            $oTableRow =3D new TableRow();
+
+            $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId)=
);
+            $oTableRow->AddTextCell($oRow->testedRating);
+            $oTableRow->AddTextCell($oRow->testedRelease);
+            $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimesta=
mp($oRow->submitTim)));
=20
-        $sReturn .=3D html_table_end();
+            if($bQueued)
+            {
+                $oM =3D new objectManager('testData_queue');
+                $oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) =
? $_SERVER['REQUEST_URI'] : "");
+                $shDeleteLink =3D '<a href=3D"'.$oM->makeUrl('delete', $oRo=
w->testingId, 'Delete entry').'">delete</a>';
+                $shEditLink =3D '<a href=3D"'.$oM->makeUrl('edit', $oRow->t=
estingId, 'Edit entry').'">edit</a>';
+                $oTableRow->addTextCell("[ $shEditLink ] &nbsp; [ $shDelete=
Link ]");
+            }
+
+            $oTableRow->SetClass($oRow->testedRating);
+            $oTable->AddRow($oTableRow);
+        }
=20
-        return $sReturn;
+        return $oTable->GetString();
     }
=20
     // return the number of test data entries for a particular version id
@@ -1143,7 +1164,7 @@ class testData{
         else if($this->iVersionId)
         {
             if($this->iSubmitterId =3D=3D $_SESSION['current']->iUserId &&
-               $this->sState =3D=3D 'rejected')
+               $this->sState !=3D 'accepted')
                 return TRUE;
=20
             $oVersion =3D new version($this->iVersionId);
--=20
1.5.1.6


--=_5go2nt4cy7wg--




More information about the wine-patches mailing list