claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

distribution: Make sState member private

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-12-12 19:13:16 +01:00
committed by Chris Morgan
parent 49d334d1d1
commit 956e5391de
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/distribution.php
View File

@@ -13,7 +13,7 @@ class distribution {
var $sUrl; var $sUrl;
var $sSubmitTime; var $sSubmitTime;
var $iSubmitterId; var $iSubmitterId;
var $sState; private $sState;
var $aTestingIds; var $aTestingIds;
// constructor, fetches the data. // constructor, fetches the data.
@@ -556,6 +556,11 @@ class distribution {
return $oOMTableRow; return $oOMTableRow;
} }
public function objectGetState()
{
return $this->sState;
}
// Whether the user has permission to edit distributions // Whether the user has permission to edit distributions
function canEdit() function canEdit()
{ {

6
include/testData_queue.php
View File

@@ -49,7 +49,7 @@ class testData_queue
$this->oTestData->unQueue(); $this->oTestData->unQueue();
/* Avoid a misguiding message about the distribution being unqueued */ /* Avoid a misguiding message about the distribution being unqueued */
if($this->oDistribution->sStatus != 'accepted') if($this->oDistribution->objectGetState() != 'accepted')
$this->oDistribution->unQueue(); $this->oDistribution->unQueue();
} }
@@ -77,7 +77,7 @@ class testData_queue
/* If we are processing queued test results with a queued distribution, /* If we are processing queued test results with a queued distribution,
we display some additional help here */ we display some additional help here */
if($this->oDistribution->iDistributionId && if($this->oDistribution->iDistributionId &&
$this->oDistribution->sStatus != 'accepted' && $this->canEdit()) $this->oDistribution->objectGetState() != 'accepted' && $this->canEdit())
{ {
echo "The user submitted a new distribution, which will be un-queued ". echo "The user submitted a new distribution, which will be un-queued ".
"together with the test data unless you select an existing one ". "together with the test data unless you select an existing one ".
@@ -88,7 +88,7 @@ class testData_queue
distribution is un-queued, there is no need to display the distribution is un-queued, there is no need to display the
distribution form here */ distribution form here */
if(!$this->oTestData->iDistributionId or if(!$this->oTestData->iDistributionId or
$this->oDistribution->sStatus != 'accepted') $this->oDistribution->objectGetState() != 'accepted')
{ {
echo html_frame_start("New Distribution", "90%"); echo html_frame_start("New Distribution", "90%");
$this->oDistribution->outputEditor(); $this->oDistribution->outputEditor();