diff --git a/admin/adminTestResults.php b/admin/adminTestResults.php deleted file mode 100644 index 5792e09..0000000 --- a/admin/adminTestResults.php +++ /dev/null @@ -1,168 +0,0 @@ -iVersionId); - if(!($_SESSION['current']->hasAppVersionModifyPermission($oVersion))) - util_show_error_page_and_exit("Insufficient privileges."); - - if(($aClean['sSub'] == 'Submit') || ($aClean['sSub'] == 'Save') || - ($aClean['sSub'] == 'Reject') || ($aClean['sSub'] == 'Delete')) - { - if(is_numeric($aClean['iTestingId'])) - { - $oTest = new testData($aClean['iTestingId']); - $oTest->GetOutputEditorValues($aClean); - - if($aClean['sSub'] == 'Submit') // submit the test results - { - $oTest->update(true); - $oTest->unQueue(); - } else if($aClean['sSub'] == 'Save') // save the test results - { - $oTest->update(); - } else if($aClean['sSub'] == 'Reject') // reject test results - { - $oTest->update(true); - $oTest->Reject(); - } else if($aClean['sSub'] == 'Delete') // delete test results - { - $oTest->delete(); - } - - util_redirect_and_exit($_SERVER['PHP_SELF']); - } - } - - if(is_numeric($aClean['iTestingId'])) - { - $oTest = new testData($aClean['iTestingId']); - } - $oVersion = new Version($oTest->iVersionId); - $oApp = new Application($oVersion->iAppId); - $sVersionInfo = $oApp->sName." ".$oVersion->sName; - - if ($aClean['sSub'] == 'view') - { - switch($oTest->sQueued) - { - case "true": - apidb_header("Edit new test results for ".$sVersionInfo); - break; - case "rejected": - apidb_header("Edit rejected test results for ".$sVersionInfo); - break; - case "false": - apidb_header("Edit test results for ".$sVersionInfo); - break; - } - - echo '
',"\n"; - // View Test Details - echo "\n"; - - //help - echo "
\n\n"; - switch($oTest->sQueued) - { - case "false": - echo "

This Test result has already been verified and accepted into the database. \n"; - echo "You can edit the entry and save it back to the database by clicking on save. \n"; - break; - case "true": - echo "

This Test result has not yet been and accepted into the database. \n"; - echo "You can edit the entry and either submit it into the database by clicking on Submit, or you can reject it \n"; - echo "for further editing by the submitter by clicking on Reject. \n"; - break; - case "rejected": - echo "

This Test result has been rejected and is awaiting further information from the submitter. \n"; - echo "You can edit the entry and either submit it into the database by clicking on Submit, or you can save it \n"; - echo "for further editing by the submitter by clicking on Save. \n"; - break; - } - echo "

Click delete to remove it entirely from the database. An email will automatically be sent to the\n"; - echo "submitter to let them know the item was deleted.

\n\n"; - echo "
\n\n"; - - echo html_back_link(1, $_SERVER['PHP_SELF']); - - $oTest->outputEditor(); - echo html_frame_start("Reply text", "90%", "", 0); - echo "\n"; - echo '',"\n"; - echo '',"\n"; - - echo '',"\n"; - echo '
email Text
' ,"\n"; - - // Submit Buttons - switch($oTest->sQueued) - { - case "false": - echo ' ',"\n"; - echo '',"\n"; - break; - case "true": - echo ' ',"\n"; - echo ' ',"\n"; - echo '',"\n"; - break; - case "rejected": - echo ' ',"\n"; - echo ' ',"\n"; - echo '',"\n"; - break; - } - echo '
',"\n"; - echo '
',"\n"; - echo html_frame_end(); - - echo html_back_link(1, $_SERVER['PHP_SELF']); - } - else - { - // error no sub! - addmsg("Internal Routine Not Found!!", "red"); - util_redirect_and_exit($_SERVER['PHP_SELF']); - } -} -else // if ($aClean['sSub']) is not defined, display the Test results queue page -{ - $oTest = new TestData(); - apidb_header("Test Results"); - - // Get rejected test results. - $hResult = $oTest->getTestingQueue("rejected"); - if(!$hResult || !mysql_num_rows($hResult)) - { - //no rejected test results in queue - echo html_frame_start("Rejected Test Results","90%"); - echo '

The Rejected Test Results Queue is empty.

',"\n"; - echo html_frame_end(" "); - } - else - { - //help - echo "
\n\n"; - echo "

This is the list of test results that have been rejected for some reason.

\n"; - echo "

To view a submission, click on its name. From that page you can Submit it into \n"; - echo "the AppDB, edit and save it or delete it.
\n"; - echo "

\n\n"; - - $oTest->ShowListofTests($hResult,"Rejected Test Results"); - } -} -apidb_footer(); -?> diff --git a/include/distribution.php b/include/distribution.php index 2c1a09a..b030d19 100644 --- a/include/distribution.php +++ b/include/distribution.php @@ -546,7 +546,7 @@ class distribution { echo ''.$oTest->sTestedRating.' ',"\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion)) { - echo '',"\n"; + echo '',"\n"; echo 'Edit',"\n"; } echo '',"\n"; diff --git a/include/objectManager.php b/include/objectManager.php index 6bbbe5b..53ea3be 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -64,15 +64,24 @@ class ObjectManager /* We pass in $this->bIsQueue to tell the object */ /* if we are requesting a list of its queued objects or */ /* all of its objects */ - $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->sIsRejected); + $hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected); /* did we get any entries? */ if(mysql_num_rows($hResult) == 0) { - if($this->bIsQueue) - echo "
The queue for '$this->sClass' is empty
"; - else - echo "
No entries of '$this->sClass' are present
"; + switch($this->getQueueString($this->bIsQueue, $this->bIsRejected)) + { + case "true": + echo "
The queue for '$this->sClass' is empty
"; + break; + case "false": + echo "
No entries of '$this->sClass' are present
"; + break; + case "rejected": + echo "
No rejected entries of '$this->sClass' are ". + "present
"; + break; + } echo "
makeUrl("add", false, "Add $this->sClass entry")."\">Add an entry?
"; @@ -124,7 +133,7 @@ class ObjectManager echo ''; echo ''; - echo ''; $oObject = new $this->sClass($this->iId); @@ -154,8 +163,13 @@ class ObjectManager echo '',"\n"; } - echo '',"\n"; + + if(!$this->bIsRejected) + { + echo '',"\n"; + } + echo '',"\n"; echo '',"\n"; @@ -285,8 +299,6 @@ class ObjectManager $this->delete_entry(); } - $sIsQueue = $tihs->bIsQueue ? "true" : "false"; - if(!$this->bIsQueue) $sAction = "view"; else diff --git a/include/sidebar_admin.php b/include/sidebar_admin.php index ec8a53d..343361f 100644 --- a/include/sidebar_admin.php +++ b/include/sidebar_admin.php @@ -39,8 +39,10 @@ function global_admin_menu() { "Distribution%20Queue"); $g->addmisc(" "); - $g->add("View Rejected Test Results", - BASE."admin/adminTestResults.php"); + $g->add("View Rejected Test Results (".testData::objectGetEntriesCount(true, + true).")", + BASE."objectManager.php?sClass=testData&bIsQueue=true&bIsRejected=true&". + "sTitle=Rejected%20Test%20Results"); $g->add("Users Management", BASE."admin/adminUsers.php"); $g->add("Comments Management", BASE."admin/adminCommentView.php"); $g->add("Screenshots Management", BASE."admin/adminScreenshots.php"); diff --git a/include/testData.php b/include/testData.php index b25e1a3..dfb02d2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -921,8 +921,8 @@ class testData{ function objectMakeUrl() { - /* STUB */ - return TRUE; + $oObject = new objectManager("testData", "Edit Test Results", $this->iTestingId); + return $oObject->makeUrl("edit", $this->iTestingId); } function objectMakeLink()