claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow users to delete/edit their queued test reports

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-12-22 00:11:55 +01:00
committed by Chris Morgan
parent 79dd0cfcf8
commit 214de5a459
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
include/testData.php
View File

@@ -916,30 +916,51 @@ class testData{
/* List test data submitted by a given user. Ignore test results for queued applications/versions */ /* List test data submitted by a given user. Ignore test results for queued applications/versions */
function listSubmittedBy($iUserId, $bQueued = true) function listSubmittedBy($iUserId, $bQueued = true)
{ {
$hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted');
if(!$hResult || !query_num_rows($hResult)) if(!$hResult || !query_num_rows($hResult))
return false; return false;
$sReturn = html_table_begin("width=\"100%\" align=\"center\""); $oTable = new Table();
$sReturn .= html_tr(array( $oTable->SetWidth("100%");
"Version", $oTable->SetAlign("center");
"Rating",
"Wine version", // setup the table header
"Submission Date"), $oTableRow = new TableRow();
"color4"); $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);
for($i = 1; $oRow = query_fetch_object($hResult); $i++) for($i = 1; $oRow = query_fetch_object($hResult); $i++)
$sReturn .= html_tr(array( {
version::fullNameLink($oRow->versionId), $oTableRow = new TableRow();
$oRow->testedRating,
$oRow->testedRelease,
print_date(mysqldatetime_to_unixtimestamp($oRow->submitTime))),
$oRow->testedRating);
$sReturn .= html_table_end(); $oTableRow->AddTextCell(version::fullNameLink($oRow->versionId));
$oTableRow->AddTextCell($oRow->testedRating);
$oTableRow->AddTextCell($oRow->testedRelease);
$oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oRow->submitTim)));
return $sReturn; if($bQueued)
{
$oM = new objectManager('testData_queue');
$oM->setReturnTo(array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : "");
$shDeleteLink = '<a href="'.$oM->makeUrl('delete', $oRow->testingId, 'Delete entry').'">delete</a>';
$shEditLink = '<a href="'.$oM->makeUrl('edit', $oRow->testingId, 'Edit entry').'">edit</a>';
$oTableRow->addTextCell("[ $shEditLink ] &nbsp; [ $shDeleteLink ]");
}
$oTableRow->SetClass($oRow->testedRating);
$oTable->AddRow($oTableRow);
}
return $oTable->GetString();
} }
// return the number of test data entries for a particular version id // return the number of test data entries for a particular version id
@@ -1143,7 +1164,7 @@ class testData{
else if($this->iVersionId) else if($this->iVersionId)
{ {
if($this->iSubmitterId == $_SESSION['current']->iUserId && if($this->iSubmitterId == $_SESSION['current']->iUserId &&
$this->sState == 'rejected') $this->sState != 'accepted')
return TRUE; return TRUE;
$oVersion = new version($this->iVersionId); $oVersion = new version($this->iVersionId);