Sort testData by id
This commit is contained in:
committed by
WineHQ
parent
ea2de6fe3c
commit
2adec2d724
@@ -828,7 +828,7 @@ class testData{
|
|||||||
return $oRow->count;
|
return $oRow->count;
|
||||||
}
|
}
|
||||||
|
|
||||||
function objectGetEntries($bQueued, $bRejected)
|
function objectGetEntries($bQueued, $bRejected, $sOrderBy = "testingId")
|
||||||
{
|
{
|
||||||
$oTest = new testData();
|
$oTest = new testData();
|
||||||
$sQueued = objectManager::getQueueString($bQueued, $bRejected);
|
$sQueued = objectManager::getQueueString($bQueued, $bRejected);
|
||||||
@@ -843,7 +843,7 @@ class testData{
|
|||||||
AND
|
AND
|
||||||
testResults.submitterId = '?'
|
testResults.submitterId = '?'
|
||||||
AND
|
AND
|
||||||
testResults.queued = '?'";
|
testResults.queued = '?' ORDER BY '?'";
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
$sQuery = "SELECT testResults.* FROM testResults, appVersion,
|
$sQuery = "SELECT testResults.* FROM testResults, appVersion,
|
||||||
@@ -868,10 +868,10 @@ class testData{
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
AND
|
AND
|
||||||
testResults.queued = '?'";
|
testResults.queued = '?' ORDER BY '?'";
|
||||||
}
|
}
|
||||||
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
|
$hResult = query_parameters($sQuery, $_SESSION['current']->iUserId,
|
||||||
$sQueued);
|
$sQueued, $sOrderBy);
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
$sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE
|
$sQuery = "SELECT testResults.* FROM testResults, appVersion WHERE
|
||||||
@@ -879,8 +879,8 @@ class testData{
|
|||||||
AND
|
AND
|
||||||
appVersion.queued = 'false'
|
appVersion.queued = 'false'
|
||||||
AND
|
AND
|
||||||
testResults.queued = '?' ORDER by testingId";
|
testResults.queued = '?' ORDER by '?'";
|
||||||
$hResult = query_parameters($sQuery, $sQueued);
|
$hResult = query_parameters($sQuery, $sQueued, $sOrderBy);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$hResult)
|
if(!$hResult)
|
||||||
|
|||||||
Reference in New Issue
Block a user