appdb/include testData_queue.php

[WineHQ]

ChangeSet ID:	31075
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/04/21 13:22:14

Modified files:
    include        : testData_queue.php

Log message:
    Alexander Nicolaysen Sørnes 
    Fix testData_queue's distribution handling. Only update the distribution if the name is set
    and avoid a misguiding message by not doing unQueue() on already unqueued distributions.

Patch: http://cvs.winehq.org/patch.py?id=31075

Old revision  New revision  Changes     Path
 1.3           1.4           +11 -2      appdb/include/testData_queue.php

Index: appdb/include/testData_queue.php
diff -u -p appdb/include/testData_queue.php:1.3 appdb/include/testData_queue.php:1.4
--- appdb/include/testData_queue.php:1.3	21 Apr 2007 18:22:14 -0000
+++ appdb/include/testData_queue.php	21 Apr 2007 18:22:14 -0000
@@ -37,7 +37,10 @@ class testData_queue
     function unQueue()
     {
         $this->oTestData->unQueue();
-        $this->oDistribution->unQueue();
+
+        /* Avoid a misguiding message about the distribution being unqueued */
+        if($this->oDistribution->sQueued != "false")
+            $this->oDistribution->unQueue();
     }

function reject()
@@ -48,7 +51,13 @@ class testData_queue
     function update()
     {
         $this->oTestData->update();
-        $this->oDistribution->update();
+
+        /* If the distribution was already un-queued the form for editing it would
+           not have been displayed and getOutputEditorValues() wouldn't have
+           retrieved a valid sName for the distribution. If sName isn't valid
+           we shouldn't update the distribution */
+        if($this->oDistribution->sName)
+            $this->oDistribution->update();
     }

function outputEditor()