Fix display of users' rejected items

This commit is contained in:
Alexander Nicolaysen Sørnes
2008-01-20 23:20:45 +01:00
committed by Chris Morgan
parent 9524dac5da
commit 3923392247
2 changed files with 4 additions and 4 deletions

View File

@@ -40,7 +40,7 @@ function global_sidebar_login() {
} }
/* Display the user's rejected applications */ /* Display the user's rejected applications */
$iAppsRejected = application::objectGetEntriesCount(true, true); $iAppsRejected = application::objectGetEntriesCount('rejected');
if($iAppsRejected && !$_SESSION['current']->hasPriv("admin")) if($iAppsRejected && !$_SESSION['current']->hasPriv("admin"))
{ {
$g->add("Review Rejected Apps ($iAppsRejected)", BASE."objectManager.php?". $g->add("Review Rejected Apps ($iAppsRejected)", BASE."objectManager.php?".
@@ -49,7 +49,7 @@ function global_sidebar_login() {
} }
/* Display the user's rejected versions */ /* Display the user's rejected versions */
$iVersionsRejected = version::objectGetEntriesCount(true, true); $iVersionsRejected = version::objectGetEntriesCount('rejected');
if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin"))
{ {
$g->add("Review Rejected Versions ($iVersionsRejected)", $g->add("Review Rejected Versions ($iVersionsRejected)",
@@ -58,7 +58,7 @@ function global_sidebar_login() {
} }
/* Display the user's rejected test results */ /* Display the user's rejected test results */
$iTestDataRejected = testData::objectGetEntriesCount(true, true); $iTestDataRejected = testData::objectGetEntriesCount('rejected');
if($iTestDataRejected && !$_SESSION['current']->hasPriv("admin")) if($iTestDataRejected && !$_SESSION['current']->hasPriv("admin"))
$g->add("Review Rejected Test Results ($iTestDataRejected)", $g->add("Review Rejected Test Results ($iTestDataRejected)",
BASE."objectManager.php?sClass=testData_queue&". BASE."objectManager.php?sClass=testData_queue&".

View File

@@ -1143,7 +1143,7 @@ class testData{
{ {
$oTest = new testData(); $oTest = new testData();
if($bQueued && !$oTest->canEdit()) if($sState != 'accepted' && !$oTest->canEdit())
{ {
if($sState == 'rejected') if($sState == 'rejected')
{ {