Report queued versions as well as queued apps in the admin sidebar. Ensure that we

don't count the version that is implicitly queued due to an application being queued.
This commit is contained in:
Chris Morgan
2005-05-05 02:52:51 +00:00
committed by WineHQ
parent 96bfbb152d
commit 13b1a42bf9
2 changed files with 13 additions and 1 deletions

View File

@@ -11,7 +11,7 @@ function global_admin_menu() {
$g->add("Add Vendor", BASE."admin/addVendor.php"); $g->add("Add Vendor", BASE."admin/addVendor.php");
$g->addmisc(" "); $g->addmisc(" ");
$g->add("View App Queue (".getQueuedAppCount().")", BASE."admin/adminAppQueue.php"); $g->add("View App Queue (".getQueuedAppCount()."/".getQueuedVersionCount().")", BASE."admin/adminAppQueue.php");
$g->add("View App Data Queue (".getQueuedAppDataCount().")", BASE."admin/adminAppDataQueue.php"); $g->add("View App Data Queue (".getQueuedAppDataCount().")", BASE."admin/adminAppDataQueue.php");
$g->add("View Maintainer Queue (".getQueuedMaintainerCount().")", BASE."admin/adminMaintainerQueue.php"); $g->add("View Maintainer Queue (".getQueuedMaintainerCount().")", BASE."admin/adminMaintainerQueue.php");
$g->add("View Maintainer Entries (".getMaintainerCount().")", BASE."admin/adminMaintainers.php"); $g->add("View Maintainer Entries (".getMaintainerCount().")", BASE."admin/adminMaintainers.php");

View File

@@ -155,6 +155,18 @@ function getQueuedAppCount()
return $ob->queued_apps; return $ob->queued_apps;
} }
function getQueuedVersionCount()
{
$qstring = "SELECT count(*) as queued_versions FROM appVersion WHERE queued='true'";
$result = query_appdb($qstring);
$ob = mysql_fetch_object($result);
/* we don't want to count the versions that are implicit in the applications */
/* that are in the queue */
return $ob->queued_versions - getQueuedAppCount();
}
/* get the number of queued appdata */ /* get the number of queued appdata */
function getQueuedAppDataCount() function getQueuedAppDataCount()
{ {