Don't display queued versions, make the function name more descriptive
This commit is contained in:
@@ -269,7 +269,7 @@ if ($_REQUEST['sub'])
|
||||
{
|
||||
echo html_frame_start("Potential duplicate versions in the database","90%","",0);
|
||||
$oAppForVersion = new Application($oVersion->iAppId);
|
||||
display_versions($oAppForVersion->iAppId, $oAppForVersion->aVersionsIds);
|
||||
display_approved_versions($oAppForVersion->aVersionsIds);
|
||||
echo html_frame_end(" ");
|
||||
|
||||
//help
|
||||
|
||||
@@ -313,7 +313,7 @@ if($_REQUEST['appId'])
|
||||
echo html_frame_end("For more details and user comments, view the versions of this application.");
|
||||
|
||||
// display versions
|
||||
display_versions($oApp->iAppId,$oApp->aVersionsIds);
|
||||
display_approved_versions($oApp->aVersionsIds);
|
||||
|
||||
// display bundle
|
||||
display_bundle($oApp->iAppId);
|
||||
|
||||
@@ -535,50 +535,6 @@ function outputSearchTableForhResult($search_words, $hResult)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* display the versions
|
||||
* Used in appview.php and adminAppQueue.php
|
||||
*/
|
||||
function display_versions($iAppId, $aVersionsIds)
|
||||
{
|
||||
if ($aVersionsIds)
|
||||
{
|
||||
echo html_frame_start("","98%","",0);
|
||||
echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n";
|
||||
|
||||
echo "<tr class=color4>\n";
|
||||
echo " <td width=\"80\">Version</td>\n";
|
||||
echo " <td>Description</td>\n";
|
||||
echo " <td width=\"80\">Rating</td>\n";
|
||||
echo " <td width=\"80\">Wine version</td>\n";
|
||||
echo " <td width=\"40\">Comments</td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
$c = 0;
|
||||
foreach($aVersionsIds as $iVersionId)
|
||||
{
|
||||
$oVersion = new Version($iVersionId);
|
||||
|
||||
// set row color
|
||||
$bgcolor = ($c % 2 == 0) ? "color0" : "color1";
|
||||
|
||||
//display row
|
||||
echo "<tr class=$bgcolor>\n";
|
||||
echo " <td><a href=\"".BASE."appview.php?versionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n";
|
||||
echo " <td>".trim_description($oVersion->sDescription)."</td>\n";
|
||||
echo " <td align=center>".$oVersion->sTestedRating."</td>\n";
|
||||
echo " <td align=center>".$oVersion->sTestedRelease."</td>\n";
|
||||
echo " <td align=center>".sizeof($oVersion->aCommentsIds)."</td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
$c++;
|
||||
|
||||
}
|
||||
echo "</table>\n";
|
||||
echo html_frame_end("Click the Version Name to view the details of that Version");
|
||||
}
|
||||
}
|
||||
|
||||
/* pass in $isVersion of true if we are processing changes for an app version */
|
||||
/* or false if processing changes for an application family */
|
||||
function process_app_version_changes($isVersion)
|
||||
|
||||
@@ -664,4 +664,47 @@ function showVersionList($hResult)
|
||||
|
||||
}
|
||||
|
||||
// display the versions
|
||||
// Used in appview.php appsubmit.php and adminAppQueue.php
|
||||
function display_approved_versions($aVersionsIds)
|
||||
{
|
||||
if ($aVersionsIds)
|
||||
{
|
||||
echo html_frame_start("","98%","",0);
|
||||
echo "<table width=\"100%\" border=\"0\" cellpadding=\"3\" cellspacing=\"1\">\n\n";
|
||||
|
||||
echo "<tr class=color4>\n";
|
||||
echo " <td width=\"80\">Version</td>\n";
|
||||
echo " <td>Description</td>\n";
|
||||
echo " <td width=\"80\">Rating</td>\n";
|
||||
echo " <td width=\"80\">Wine version</td>\n";
|
||||
echo " <td width=\"40\">Comments</td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
$c = 0;
|
||||
foreach($aVersionsIds as $iVersionId)
|
||||
{
|
||||
$oVersion = new Version($iVersionId);
|
||||
if ($oVersion->sQueued = 'false')
|
||||
{
|
||||
// set row color
|
||||
$bgcolor = ($c % 2 == 0) ? "color0" : "color1";
|
||||
|
||||
//display row
|
||||
echo "<tr class=$bgcolor>\n";
|
||||
echo " <td><a href=\"".BASE."appview.php?versionId=".$iVersionId."\">".$oVersion->sName."</a></td>\n";
|
||||
echo " <td>".trim_description($oVersion->sDescription)."</td>\n";
|
||||
echo " <td align=center>".$oVersion->sTestedRating."</td>\n";
|
||||
echo " <td align=center>".$oVersion->sTestedRelease."</td>\n";
|
||||
echo " <td align=center>".sizeof($oVersion->aCommentsIds)."</td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
$c++;
|
||||
}
|
||||
}
|
||||
echo "</table>\n";
|
||||
echo html_frame_end("Click the Version Name to view the details of that Version");
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user