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) function objectGetHeader($sType)
{ {
$aCells = array( $oTableRow = new TableRow();
"Submission Date", $oTableRow->AddTextCell("Submission Date");
"Submitter", $oTableRow->AddTextCell("Submitter");
"Application", $oTableRow->AddTextCell("Application");
"Version"); $oTableRow->AddTextCell("Version");
return $oTableRow;
return $aCells;
} }
function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sType) function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0, $sType)

View File

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

View File

@@ -57,12 +57,18 @@ class browse_newest_apps
function objectGetHeader() function objectGetHeader()
{ {
$aCells = array( $oTableRow = new TableRow();
array("Submission Date", "color=\"white\""),
array("Application", "color=\"white\""),
array("Description", "color=\"white\""));
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() function objectGetTableRow()

View File

@@ -423,12 +423,17 @@ class distribution {
function objectGetHeader() function objectGetHeader()
{ {
$aCells = array( $oTableRow = new TableRow();
"Distribution name",
"Distribution url",
array("Linked Tests", "align=\"right\""));
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) function objectGetEntries($bQueued, $bRejected, $iRows = 0, $iStart = 0)

View File

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

View File

@@ -643,14 +643,18 @@ class ObjectManager
function outputHeader($sClass) function outputHeader($sClass)
{ {
$oObject = new $this->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. /* 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 */ Even though a user annot process items, he can edit his queued submissions */
if($oObject->canEdit() || $this->bIsQueue) 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) function handleMultiPageControls($aClean, $bItemsPerPageSelector = TRUE)

View File

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

View File

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

View File

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