appdb/. testResults.php appsubmit.php

[WineHQ]

ChangeSet ID:	22336
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2006/01/16 20:33:14

Modified files:
    .              : testResults.php appsubmit.php

Log message:
    Tony Lambregts 
    Only create new distributions if the user didn't pick one from the dropdown menu.  Previous behavior would create a new distribution if any text was present in the 'distribution' textbox, even if a distribution is picked from the dropdown menu.

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

Old revision  New revision  Changes     Path
 1.1           1.2           +17 -14     appdb/testResults.php
 1.35          1.36          +9 -7       appdb/appsubmit.php

Index: appdb/testResults.php
diff -u -p appdb/testResults.php:1.1 appdb/testResults.php:1.2
--- appdb/testResults.php:1.1	17 Jan 2006  2:33:14 -0000
+++ appdb/testResults.php	17 Jan 2006  2:33:14 -0000
@@ -27,22 +27,25 @@ if ($_REQUEST['sub'])
         $oTest->GetOutputEditorValues(); // retrieve the values from the current $_REQUEST 
         if(empty($errors))
         {
-            $sDistribution = trim($_REQUEST['sDistribution']);
-            if(!empty($sDistribution))
+            if(!$_REQUEST['iDistributionId'])
             {
-                $oDistribution = new distribution();
-                $oDistribution->sName = $sDistribution;
-                $oDistribution->create();
-                $oTest->iDistributionId = $oDistribution->iDistributionId;
+                $sDistribution = trim($_REQUEST['sDistribution']);
+                if(!empty($sDistribution))
+                {
+                    $oDistribution = new distribution();
+                    $oDistribution->sName = $sDistribution;
+                    $oDistribution->create();
+                    $oTest->iDistributionId = $oDistribution->iDistributionId;
+                }
+            }
+            if($_REQUEST['sub'] == 'Submit')
+            {
+	        $oTest->create();
+            } else if($_REQUEST['sub'] == 'Resubmit')
+            {
+                $oTest->update(true);
+	        $oTest->ReQueue();
             }
-		if($_REQUEST['sub'] == 'Submit')
-		{
-	            $oTest->create();
-		} else if($_REQUEST['sub'] == 'Resubmit')
-		{
-	            $oTest->update(true);
-	            $oTest->ReQueue();
-		}
             redirect($_SERVER['PHP_SELF']);
         } else 
         {
Index: appdb/appsubmit.php
diff -u -p appdb/appsubmit.php:1.35 appdb/appsubmit.php:1.36
--- appdb/appsubmit.php:1.35	17 Jan 2006  2:33:14 -0000
+++ appdb/appsubmit.php	17 Jan 2006  2:33:14 -0000
@@ -181,14 +181,16 @@ if ($_REQUEST['sub'])
             {
                  $oVersion->create();
             }
-
-            $sDistribution = trim($_REQUEST['sDistribution']);
-            if(!empty($sDistribution))
+            if(!$_REQUEST['iDistributionId'])
             {
-                $oDistribution = new distribution();
-                $oDistribution->sName = $sDistribution;
-                $oDistribution->create();
-                $oTest->iDistributionId = $oDistribution->iDistributionId;
+                $sDistribution = trim($_REQUEST['sDistribution']);
+                if(!empty($sDistribution))
+                {
+                    $oDistribution = new distribution();
+                    $oDistribution->sName = $sDistribution;
+                    $oDistribution->create();
+                    $oTest->iDistributionId = $oDistribution->iDistributionId;
+                }
             }
             $oTest->iVersionId = $oVersion->iVersionId;
             if(is_numeric($oTest->iTestingId))