objectGetHeader() should return a TableRow instance as this is closer to what the information

represents and is a much more useful form.
This commit is contained in:
Chris Morgan
2007-07-31 01:51:40 +00:00
committed by WineHQ
parent 9231bac634
commit 0e3472e1bf
10 changed files with 74 additions and 57 deletions

View File

@@ -305,13 +305,12 @@ class appData
function objectGetHeader($sType)
{
$aCells = array(
"Submission Date",
"Submitter",
"Application",
"Version");
return $aCells;
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Application");
$oTableRow->AddTextCell("Version");
return $oTableRow;
}
function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sType)

View File

@@ -884,13 +884,12 @@ class Application {
function objectGetHeader()
{
$aCells = array(
"Submission Date",
"Submitter",
"Vendor",
"Application");
return $aCells;
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Vendor");
$oTableRow->AddTextCell("Application");
return $oTableRow;
}
function objectGetTableRow()

View File

@@ -57,12 +57,18 @@ class browse_newest_apps
function objectGetHeader()
{
$aCells = array(
array("Submission Date", "color=\"white\""),
array("Application", "color=\"white\""),
array("Description", "color=\"white\""));
$oTableRow = new TableRow();
return $aCells;
$oTableCell = new TableCell("Submission Date");
$oTableRow->AddCell($oTableCell);
$oTableCell = new TableCell("Application");
$oTableRow->AddCell($oTableCell);
$oTableCell = new TableCell("Description");
$oTableRow->AddCell($oTableCell);
return $oTableRow;
}
function objectGetTableRow()

View File

@@ -423,12 +423,17 @@ class distribution {
function objectGetHeader()
{
$aCells = array(
"Distribution name",
"Distribution url",
array("Linked Tests", "align=\"right\""));
$oTableRow = new TableRow();
return $aCells;
$oTableRow->AddTextCell("Distribution name");
$oTableRow->AddTextCell("Distribution url");
$oTableCell = new TableCell("Linked Tests");
$oTableCell->SetAlign("right");
$oTableRow->AddCell($oTableCell);
return $oTableRow;
}
function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0)

View File

@@ -648,14 +648,13 @@ class maintainer
function ObjectGetHeader()
{
$aCells = array(
"Submission Date",
"Application Name",
"Version",
"Super maintainer?",
"Submitter");
return $aCells;
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Application Name");
$oTableRow->AddTextCell("Version");
$oTableRow->AddTextCell("Super maintainer?");
$oTableRow->AddTextCell("Submitter");
return $oTableRow;
}
function ObjectGetTableRow()

View File

@@ -643,14 +643,18 @@ class ObjectManager
function outputHeader($sClass)
{
$oObject = new $this->sClass();
$aCells = $oObject->objectGetHeader();
$oTableRow = $oObject->objectGetHeader();
/* Add an action column if the user can edit this class, or if it is a queue.
Even though a user annot process items, he can edit his queued submissions */
if($oObject->canEdit() || $this->bIsQueue)
$aCells[] = "Action";
{
$oTableRow->AddTextCell("Action");
}
echo html_tr($aCells, $sClass);
$oTableRow->SetClass($sClass);
echo $oTableRow->GetString();
}
function handleMultiPageControls($aClean, $bItemsPerPageSelector = TRUE)

View File

@@ -68,7 +68,7 @@ class TableRowClick
$sStr.= ' onclick="DoNav(\''.$this->shUrl.'\');"';
return $sStr;
return $sStr;
}
}

View File

@@ -991,15 +991,15 @@ class testData{
function objectGetHeader()
{
$aCells = array(
"Submission Date",
"Submitter",
"Application",
"Version",
"Release",
"Has maintainer",
"Rating");
return $aCells;
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Application");
$oTableRow->AddTextCell("Version");
$oTableRow->AddTextCell("Release");
$oTableRow->AddTextCell("Has maintainer");
$oTableRow->AddTextCell("Rating");
return $oTableRow;
}
function objectGetTableRow()

View File

@@ -237,12 +237,17 @@ class Vendor {
function objectGetHeader()
{
$aCells = array(
"Name",
"Website",
array("Linked apps", "align=\"right\""));
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Name");
return $aCells;
$oTableRow->AddTextCell("Website");
$oTableCell = new TableCell("Linked apps");
$oTableCell->SetAlign("right");
$oTableRow->AddCell($oTableCell);
return $oTableRow;
}
// returns an OMTableRow instance

View File

@@ -1399,13 +1399,13 @@ class version {
function objectGetHeader()
{
$aCells = array(
"Submission Date",
"Submitter",
"Vendor",
"Application",
"Version");
return $aCells;
$oTableRow = new TableRow();
$oTableRow->AddTextCell("Submission Date");
$oTableRow->AddTextCell("Submitter");
$oTableRow->AddTextCell("Vendor");
$oTableRow->AddTextCell("Application");
$oTableRow->AddTextCell("Version");
return $oTableRow;
}
function objectGetItemsPerPage($bQueued = false)