From 39233922471a1ca18420e4c37f1d7555d72fdc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= Date: Sun, 20 Jan 2008 23:20:45 +0100 Subject: [PATCH] Fix display of users' rejected items --- include/sidebar_login.php | 6 +++--- include/testData.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/sidebar_login.php b/include/sidebar_login.php index eb18ce2..b8f2a32 100644 --- a/include/sidebar_login.php +++ b/include/sidebar_login.php @@ -40,7 +40,7 @@ function global_sidebar_login() { } /* Display the user's rejected applications */ - $iAppsRejected = application::objectGetEntriesCount(true, true); + $iAppsRejected = application::objectGetEntriesCount('rejected'); if($iAppsRejected && !$_SESSION['current']->hasPriv("admin")) { $g->add("Review Rejected Apps ($iAppsRejected)", BASE."objectManager.php?". @@ -49,7 +49,7 @@ function global_sidebar_login() { } /* Display the user's rejected versions */ - $iVersionsRejected = version::objectGetEntriesCount(true, true); + $iVersionsRejected = version::objectGetEntriesCount('rejected'); if($iVersionsRejected && !$_SESSION['current']->hasPriv("admin")) { $g->add("Review Rejected Versions ($iVersionsRejected)", @@ -58,7 +58,7 @@ function global_sidebar_login() { } /* Display the user's rejected test results */ - $iTestDataRejected = testData::objectGetEntriesCount(true, true); + $iTestDataRejected = testData::objectGetEntriesCount('rejected'); if($iTestDataRejected && !$_SESSION['current']->hasPriv("admin")) $g->add("Review Rejected Test Results ($iTestDataRejected)", BASE."objectManager.php?sClass=testData_queue&". diff --git a/include/testData.php b/include/testData.php index 899a4fe..19cf8ae 100644 --- a/include/testData.php +++ b/include/testData.php @@ -1143,7 +1143,7 @@ class testData{ { $oTest = new testData(); - if($bQueued && !$oTest->canEdit()) + if($sState != 'accepted' && !$oTest->canEdit()) { if($sState == 'rejected') {