Add and use distribution::display()
This commit is contained in:
committed by
WineHQ
parent
446191f533
commit
cbfc49f42f
@@ -43,7 +43,7 @@ if(!$oDistribution->iDistributionId)
|
||||
{
|
||||
$oDistribution = distribution::ObjectGetInstanceFromRow($oRow);
|
||||
|
||||
$oDistribution->display(($c % 2) ? "color0" : "color1");
|
||||
$oDistribution->objectOutputTableRow(($c % 2) ? "color0" : "color1");
|
||||
}
|
||||
echo "</table>\n\n";
|
||||
echo html_frame_end(" ");
|
||||
@@ -57,78 +57,7 @@ else
|
||||
apidb_header("View Distribution");
|
||||
echo html_frame_start("Distribution Information",500);
|
||||
|
||||
echo "Distribution Name:";
|
||||
|
||||
if($oDistribution->sUrl)
|
||||
echo "<a href='".$oDistribution->sUrl."'>";
|
||||
|
||||
echo $oDistribution->sName;
|
||||
|
||||
if ($oDistribution->sUrl)
|
||||
{
|
||||
echo " (".$oDistribution->sUrl.")";
|
||||
echo "</a> <br />\n";
|
||||
} else
|
||||
{
|
||||
echo "<br />\n";
|
||||
}
|
||||
|
||||
if($oDistribution->aTestingIds)
|
||||
{
|
||||
echo '<p><span class="title">Testing Results for '.$oDistribution->sName.'</span><br />',"\n";
|
||||
echo '<table width="100%" border="1">',"\n";
|
||||
echo '<thead class="historyHeader">',"\n";
|
||||
echo '<tr>',"\n";
|
||||
echo '<td>Application Version</td>',"\n";
|
||||
echo '<td>Submitter</td>',"\n";
|
||||
echo '<td>Date Submitted</td>',"\n";
|
||||
echo '<td>Wine version</td>',"\n";
|
||||
echo '<td>Installs?</td>',"\n";
|
||||
echo '<td>Runs?</td>',"\n";
|
||||
echo '<td>Rating</td>',"\n";
|
||||
echo '</tr></thead>',"\n";
|
||||
foreach($oDistribution->aTestingIds as $iTestingId)
|
||||
{
|
||||
$oTest = new testData($iTestingId);
|
||||
$oVersion = new Version($oTest->iVersionId);
|
||||
$oApp = new Application($oVersion->iAppId);
|
||||
$oSubmitter = new User($oTest->iSubmitterId);
|
||||
$bgcolor = $oTest->sTestedRating;
|
||||
|
||||
/* make sure the user can view the versions we list in the table */
|
||||
/* otherwise skip over displaying the entries in this table */
|
||||
if(!$_SESSION[current]->canViewApplication($oApp))
|
||||
continue;
|
||||
if(!$_SESSION[current]->canViewVersion($oVersion))
|
||||
continue;
|
||||
|
||||
echo '<tr class='.$bgcolor.'>',"\n";
|
||||
echo '<td><a href="'.BASE.'appview.php?iVersionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n";
|
||||
echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n";
|
||||
echo '<td>',"\n";
|
||||
if($_SESSION['current']->isLoggedIn())
|
||||
{
|
||||
echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":"";
|
||||
echo $oSubmitter->sRealname;
|
||||
echo $oSubmitter->sEmail ? "</a>":"";
|
||||
}
|
||||
else
|
||||
echo $oSubmitter->sRealname;
|
||||
echo '</td>',"\n";
|
||||
echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n";
|
||||
echo '<td>'.$oTest->sTestedRelease.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sInstalls.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sRuns.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sTestedRating.' </td>',"\n";
|
||||
if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion))
|
||||
{
|
||||
echo '<td><a href="'.BASE.'admin/adminTestResults.php?sSub=view&iTestingId='.$oTest->iTestingId.'">',"\n";
|
||||
echo 'Edit</a></td>',"\n";
|
||||
}
|
||||
echo '</tr>',"\n";
|
||||
}
|
||||
echo '</table>',"\n";
|
||||
}
|
||||
$oDistribution->display();
|
||||
|
||||
echo html_frame_end();
|
||||
echo html_back_link(1);
|
||||
|
||||
@@ -464,7 +464,7 @@ class distribution {
|
||||
return new distribution($oRow->distributionId);
|
||||
}
|
||||
|
||||
function display($sClass = "")
|
||||
function objectOutputTableRow($sClass = "")
|
||||
{
|
||||
$aCells = array(
|
||||
"<a href=\"".BASE."distributionView.php?iDistributionId=".
|
||||
@@ -496,6 +496,82 @@ class distribution {
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
function display()
|
||||
{
|
||||
echo "Distribution Name:";
|
||||
|
||||
if($this->sUrl)
|
||||
echo "<a href='".$this->sUrl."'>";
|
||||
|
||||
echo $this->sName;
|
||||
|
||||
if ($this->sUrl)
|
||||
{
|
||||
echo " (".$this->sUrl.")";
|
||||
echo "</a> <br />\n";
|
||||
} else
|
||||
{
|
||||
echo "<br />\n";
|
||||
}
|
||||
|
||||
if($this->aTestingIds)
|
||||
{
|
||||
echo '<p><span class="title">Testing Results for '.$this->sName.'</span><br />',"\n";
|
||||
echo '<table width="100%" border="1">',"\n";
|
||||
echo '<thead class="historyHeader">',"\n";
|
||||
echo '<tr>',"\n";
|
||||
echo '<td>Application Version</td>',"\n";
|
||||
echo '<td>Submitter</td>',"\n";
|
||||
echo '<td>Date Submitted</td>',"\n";
|
||||
echo '<td>Wine version</td>',"\n";
|
||||
echo '<td>Installs?</td>',"\n";
|
||||
echo '<td>Runs?</td>',"\n";
|
||||
echo '<td>Rating</td>',"\n";
|
||||
echo '</tr></thead>',"\n";
|
||||
foreach($this->aTestingIds as $iTestingId)
|
||||
{
|
||||
$oTest = new testData($iTestingId);
|
||||
$oVersion = new Version($oTest->iVersionId);
|
||||
$oApp = new Application($oVersion->iAppId);
|
||||
$oSubmitter = new User($oTest->iSubmitterId);
|
||||
$bgcolor = $oTest->sTestedRating;
|
||||
|
||||
/* make sure the user can view the versions we list in the table */
|
||||
/* otherwise skip over displaying the entries in this table */
|
||||
if(!$_SESSION[current]->canViewApplication($oApp))
|
||||
continue;
|
||||
if(!$_SESSION[current]->canViewVersion($oVersion))
|
||||
continue;
|
||||
|
||||
echo '<tr class='.$bgcolor.'>',"\n";
|
||||
echo '<td><a href="'.BASE.'appview.php?iVersionId='.$oTest->iVersionId.'&iTestingId='.$oTest->iTestingId.'">',"\n";
|
||||
echo $oApp->sName.' '.$oVersion->sName.'</a></td>',"\n";
|
||||
echo '<td>',"\n";
|
||||
if($_SESSION['current']->isLoggedIn())
|
||||
{
|
||||
echo $oSubmitter->sEmail ? "<a href=\"mailto:".$oSubmitter->sEmail."\">":"";
|
||||
echo $oSubmitter->sRealname;
|
||||
echo $oSubmitter->sEmail ? "</a>":"";
|
||||
}
|
||||
else
|
||||
echo $oSubmitter->sRealname;
|
||||
echo '</td>',"\n";
|
||||
echo '<td>'.date("M d Y", mysqltimestamp_to_unixtimestamp($oTest->sSubmitTime)).'</td>',"\n";
|
||||
echo '<td>'.$oTest->sTestedRelease.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sInstalls.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sRuns.' </td>',"\n";
|
||||
echo '<td>'.$oTest->sTestedRating.' </td>',"\n";
|
||||
if ($_SESSION['current']->hasAppVersionModifyPermission($oVersion))
|
||||
{
|
||||
echo '<td><a href="'.BASE.'admin/adminTestResults.php?sSub=view&iTestingId='.$oTest->iTestingId.'">',"\n";
|
||||
echo 'Edit</a></td>',"\n";
|
||||
}
|
||||
echo '</tr>',"\n";
|
||||
}
|
||||
echo '</table>',"\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user