testData: Fix 'Show All Tests' button

This commit is contained in:
Alexander Nicolaysen Sørnes
2007-09-24 13:26:49 +02:00
committed by Chris Morgan
parent c4736bf21c
commit c90d271886
2 changed files with 17 additions and 8 deletions

View File

@@ -963,6 +963,7 @@ class ObjectManager
$sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n";
$sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n";
$sReturn .= "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$this->sReturnTo."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$this->sReturnTo."\" />\n";
$sReturn .= "<input type=\"hidden\" name=\"iId\" value=\"".$this->iId."\" />\n";
if($this->oMultiPage->bEnabled) if($this->oMultiPage->bEnabled)
{ {

View File

@@ -480,7 +480,7 @@ class testData{
$link = query_escape_string($link); $link = query_escape_string($link);
$iDisplayLimit = query_escape_string($iDisplayLimit); $iDisplayLimit = query_escape_string($iDisplayLimit);
$sShowAll = isset($aClean['sShowAll']) ? $aClean['sShowAll'] : false; $bShowAll = ($aClean['bShowAll'] == "true") ? true : false;
$sQuery = "SELECT * $sQuery = "SELECT *
FROM testResults FROM testResults
@@ -489,7 +489,7 @@ class testData{
queued = '?' queued = '?'
ORDER BY testedDate DESC"; ORDER BY testedDate DESC";
if(!$sShowAll) if(!$bShowAll)
$sQuery.=" LIMIT 0,".$iDisplayLimit; $sQuery.=" LIMIT 0,".$iDisplayLimit;
$hResult = query_parameters($sQuery, $this->iVersionId, "false"); $hResult = query_parameters($sQuery, $this->iVersionId, "false");
@@ -603,15 +603,23 @@ class testData{
echo '<br />',"\n"; // put a space after the test results table and the button echo '<br />',"\n"; // put a space after the test results table and the button
echo '<form method=get action="'.$_SERVER['PHP_SELF'].'">'."\n"; echo '<form method=get action="objectManager.php">'."\n";
echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n";
if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll))
echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n";
if(is_string($sShowAll)) if($rowsUsed >= $iDisplayLimit && $bShowAll)
{ {
echo "\t".'<input class="button" name="sHideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'."\n"; $sShowButtonText = "Limit to $iDisplayLimit Tests";
} else
{
$sShowButtonText = "Show All Tests";
echo '<input type="hidden" name="bShowAll" value="true" />';
} }
$oManager = new objectManager("version", null, $this->iVersionId);
echo $oManager->makeUrlFormData();
echo "\t".'<input class="button" type=submit value="'.$sShowButtonText.'" />'."\n";
echo '</form>'."\n"; echo '</form>'."\n";
echo '</div>',"\n"; // end of the 'info_contents' div echo '</div>',"\n"; // end of the 'info_contents' div