Chris Morgan
Only display testing results for applications that are not currently queued if the user isn't an admin.
This commit is contained in:
@@ -119,6 +119,14 @@ else
|
|||||||
$oApp = new application($oVersion->iAppId);
|
$oApp = new application($oVersion->iAppId);
|
||||||
$oSubmitter = new User($oTest->iSubmitterId);
|
$oSubmitter = new User($oTest->iSubmitterId);
|
||||||
$bgcolor = $oTest->sTestedRating;
|
$bgcolor = $oTest->sTestedRating;
|
||||||
|
|
||||||
|
/* make sure the user can view the versions we list in the table */
|
||||||
|
/* otherwise skip over displaying the entries in this table */
|
||||||
|
if(!$_SESSION[current]->canViewApplication($oApp))
|
||||||
|
continue;
|
||||||
|
if(!$_SESSION[current]->canViewVersion($oVersion))
|
||||||
|
continue;
|
||||||
|
|
||||||
echo '<tr class='.$bgcolor.'>',"\n";
|
echo '<tr class='.$bgcolor.'>',"\n";
|
||||||
echo '<td><a href="'.BASE.'appview.php?versionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n";
|
echo '<td><a href="'.BASE.'appview.php?versionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n";
|
||||||
echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n";
|
echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n";
|
||||||
|
|||||||
@@ -44,9 +44,25 @@ class distribution{
|
|||||||
/*
|
/*
|
||||||
* We fetch Test Result Ids.
|
* We fetch Test Result Ids.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
if($_SESSION['current']->hasPriv("admin"))
|
||||||
|
{
|
||||||
$sQuery = "SELECT testingId
|
$sQuery = "SELECT testingId
|
||||||
FROM testResults
|
FROM testResults
|
||||||
WHERE distributionId = ".$iDistributionId;
|
WHERE distributionId = ".$iDistributionId;
|
||||||
|
} else /* only let users view test results that aren't queued and for apps that */
|
||||||
|
/* aren't queued or versions that aren't queued */
|
||||||
|
{
|
||||||
|
$sQuery = "SELECT testingId
|
||||||
|
FROM testResults, appFamily, appVersion
|
||||||
|
WHERE testResults.queued = 'false' AND
|
||||||
|
testResults.versionId = appVersion.versionId AND
|
||||||
|
appFamily.appId = appVersion.appId AND
|
||||||
|
appFamily.queued = 'false' AND
|
||||||
|
appVersion.queued = 'false' AND
|
||||||
|
distributionId = ".$iDistributionId;
|
||||||
|
}
|
||||||
|
|
||||||
if($hResult = query_appdb($sQuery))
|
if($hResult = query_appdb($sQuery))
|
||||||
{
|
{
|
||||||
while($oRow = mysql_fetch_object($hResult))
|
while($oRow = mysql_fetch_object($hResult))
|
||||||
|
|||||||
Reference in New Issue
Block a user