appdb/include appData.php objectManager.php ta ...

[WineHQ]

ChangeSet ID:	31263
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/07/23 15:30:57

Modified files:
    include        : appData.php objectManager.php table.php

Log message:
    Chris Morgan 
    Fix appData objectGetTableRow() to work with the new table classes

Patch: http://cvs.winehq.org/patch.py?id=31263

Old revision  New revision  Changes     Path
 1.28          1.29          +10 -7      appdb/include/appData.php
 1.37          1.38          +1 -1       appdb/include/objectManager.php
 1.1           1.2           +1 -0       appdb/include/table.php

Index: appdb/include/appData.php
diff -u -p appdb/include/appData.php:1.28 appdb/include/appData.php:1.29
--- appdb/include/appData.php:1.28	23 Jul 2007 20:30:57 -0000
+++ appdb/include/appData.php	23 Jul 2007 20:30:57 -0000
@@ -497,14 +497,17 @@ class appData

$oApp = new Application($this->iAppId);
         $oUser = new User($this->iSubmitterId);
-        $aCells = array(
-                print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)),
-                $oUser->objectMakeLink(),
-                $oApp->objectMakeLink(),
-                $this->iVersionId ? $oVersion->objectMakeLink() : "N/A");

-        $oTableRow = new TableRow($aCells);
-        return $oTableRow;
+        $oTableRow = new TableRow();
+        $oTableRow->AddTextCell(print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)));
+        $oTableRow->AddTextCell($oUser->objectMakeLink());
+        $oTableRow->AddTextCell($oApp->objectMakeLink());
+        $oTableRow->AddTextCell($this->iVersionId ? $oVersion->objectMakeLink() : "N/A");
+
+        // create the object manager specific row
+        $oOMTableRow = new OMTableRow($oTableRow);
+
+        return $oOMTableRow;
     }

function objectDisplayQueueProcessingHelp()
Index: appdb/include/objectManager.php
diff -u -p appdb/include/objectManager.php:1.37 appdb/include/objectManager.php:1.38
--- appdb/include/objectManager.php:1.37	23 Jul 2007 20:30:57 -0000
+++ appdb/include/objectManager.php	23 Jul 2007 20:30:57 -0000
@@ -153,7 +153,7 @@ class ObjectManager
             //TODO: we shouldn't access this method directly, should make an accessor for it
             if(!$this->oTableRow->oTableRow->sClass)
             {
-                $this->oTableRow->oTableRow->sClass = $sColor;
+                $this->oTableRow->oTableRow->SetClass($sColor);
             }

// if this row is clickable, make it highlight appropirately
Index: appdb/include/table.php
diff -u -p appdb/include/table.php:1.1 appdb/include/table.php:1.2
--- appdb/include/table.php:1.1	23 Jul 2007 20:30:57 -0000
+++ appdb/include/table.php	23 Jul 2007 20:30:57 -0000
@@ -199,6 +199,7 @@ class TableRow
       $this->aTableCells = array();
       $this->sStyle = null;
       $this->sClass = null;
+      $this->sExtra = null;
       $this->oTableRowClick = null;
     }