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:
@@ -11,7 +11,7 @@ function global_admin_menu() {
|
||||
$g->add("Add Vendor", BASE."admin/addVendor.php");
|
||||
|
||||
$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 Maintainer Queue (".getQueuedMaintainerCount().")", BASE."admin/adminMaintainerQueue.php");
|
||||
$g->add("View Maintainer Entries (".getMaintainerCount().")", BASE."admin/adminMaintainers.php");
|
||||
|
||||
@@ -155,6 +155,18 @@ function getQueuedAppCount()
|
||||
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 */
|
||||
function getQueuedAppDataCount()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user