Alexander Nicolaysen Sørnes : version: Add 'pending' queue state
Chris Morgan
cmorgan at winehq.org
Tue Nov 6 23:23:35 CST 2007
Module: appdb
Branch: master
Commit: 62e3a98fca06912ea3f02f203797fe1fa14691c1
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=62e3a98fca06912ea3f02f203797fe1fa14691c1
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Tue Nov 6 23:27:33 2007 +0100
version: Add 'pending' queue state
---
include/version.php | 8 ++++++--
include/version_queue.php | 1 -
tables/appdb_tables.sql | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/version.php b/include/version.php
index d69e0ee..371a947 100644
--- a/include/version.php
+++ b/include/version.php
@@ -92,7 +92,11 @@ class version {
if(!$_SESSION['current']->canCreateVersion())
return;
- $this->sQueued = $this->mustBeQueued() ? "true" : "false";
+ $oApp = new application($this->iAppId);
+ if($oApp->sQueued != "false")
+ $this->sQueued = "pending";
+ else
+ $this->sQueued = $this->mustBeQueued() ? "true" : "false";
$hResult = query_parameters("INSERT INTO appVersion
(versionName, description, maintainer_release,
@@ -274,7 +278,7 @@ class version {
return;
// If we are not in the queue, we can't move the version out of the queue.
- if(!$this->sQueued == 'true')
+ if($this->sQueued == 'false')
return false;
if(query_parameters("UPDATE appVersion SET queued = '?' WHERE versionId = '?'",
diff --git a/include/version_queue.php b/include/version_queue.php
index afc25b0..d2bb809 100644
--- a/include/version_queue.php
+++ b/include/version_queue.php
@@ -52,7 +52,6 @@ class version_queue
function reQueue()
{
- $this->oVersion->reQueue();
$this->oDownloadUrl->reQueue();
}
diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql
index d064108..4273e3e 100644
--- a/tables/appdb_tables.sql
+++ b/tables/appdb_tables.sql
@@ -58,7 +58,7 @@ create table appVersion (
maintainer_release text,
submitTime datetime NOT NULL,
submitterId int(11) NOT NULL default '0',
- queued enum('true','false','rejected') NOT NULL default 'false',
+ queued enum('true','false','rejected','pending') NOT NULL default 'false',
license enum('Retail','Open Source','Freeware','Demo','Shareware'),
obsoleteBy int(11) NOT NULL default '0',
key(versionId),
More information about the wine-cvs
mailing list