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

Use sState as parameter to objectGetItemsPerPage()

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2007-12-19 15:06:35 +01:00
committed by Chris Morgan
parent 52cd2fc55d
commit da97299eeb
12 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/application.php
View File

@@ -349,7 +349,7 @@ class Application {
}
}
public static function objectGetItemsPerPage($bQueued = false)
public static function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

4
include/application_queue.php
View File

@@ -373,9 +373,9 @@ class application_queue
return TRUE;
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
return $this->oApp->objectGetItemsPerPage($bQueued);
return $this->oApp->objectGetItemsPerPage($sState);
}
function objectGetEntriesCount($bQueued, $bRejected)

2
include/bugs.php
View File

@@ -464,7 +464,7 @@ class Bug
return false;
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

2
include/distribution.php
View File

@@ -742,7 +742,7 @@ class distribution {
return $iCount;
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

2
include/maintainer.php
View File

@@ -873,7 +873,7 @@ class maintainer
return TRUE;
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

16
include/objectManager.php
View File

@@ -12,6 +12,7 @@ class ObjectManager
private $sTitle;
private $iId;
private $bIsRejected;
private $sState;
private $sReturnTo;
private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */
private $oMultiPage;
@@ -62,6 +63,11 @@ class ObjectManager
public function setIsQueue($bIsQueue)
{
$this->bIsQueue = $bIsQueue;
if($this->sState != 'rejected' && $bIsQueue)
$this->sState = 'queued';
else if ($this->sState == 'queued' && !$bIsQueue)
$this->sState = 'accepted';
}
public function getIsQueue()
@@ -82,6 +88,11 @@ class ObjectManager
public function setIsRejected($bIsRejected)
{
$this->bIsRejected = $bIsRejected;
if($bIsRejected)
$this->sState = 'rejected';
else if ($this->sState == 'rejected')
$this->sState = 'queued';
}
public function setSortInfo($aClean = null)
@@ -114,6 +125,7 @@ class ObjectManager
$this->iId = $iId;
$this->oMultiPage = new MultiPage(FALSE);
$this->oTableRow = new OMTableRow(null);
$this->sState = 'accepted';
// initialize the common responses array
$this->aCommonResponses = array();
@@ -1314,14 +1326,14 @@ class ObjectManager
$oObject = new $this->sClass();
if(!method_exists($oObject, "objectGetItemsPerPage") ||
$oObject->objectGetItemsPerPage($this->bIsQueue) === FALSE)
$oObject->objectGetItemsPerPage($this->sState) === FALSE)
{
/* Do not enable the MultiPage controls */
$this->oMultiPage->MultiPage(FALSE);
return;
}
$aReturn = $oObject->objectGetItemsPerPage($this->bIsQueue);
$aReturn = $oObject->objectGetItemsPerPage($this->sState);
$aItemsPerPage = $aReturn[0];
$iDefaultPerPage = $aReturn[1];

4
include/screenshot.php
View File

@@ -595,9 +595,9 @@ class screenshot
return $shImg;
}
public static function objectGetItemsPerPage($bQueued = false)
public static function objectGetItemsPerPage($sState = 'accepted')
{
if($bQueued)
if($sState != 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

2
include/testData.php
View File

@@ -1253,7 +1253,7 @@ class testData{
return mysqltimestamp_to_unixtimestamp($this->sSubmitTime);
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

4
include/testData_queue.php
View File

@@ -198,9 +198,9 @@ class testData_queue
return $this->oTestData->objectGetSubmitTime();
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
return testData::objectGetItemsPerPage($bQueued);
return testData::objectGetItemsPerPage($sState);
}
function objectGetId()

2
include/vendor.php
View File

@@ -447,7 +447,7 @@ class Vendor {
return $this->iVendorId;
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

2
include/version.php
View File

@@ -1518,7 +1518,7 @@ class version {
return $oTableRow;
}
public static function objectGetItemsPerPage($bQueued = false)
public static function objectGetItemsPerPage($sState = 'accepted')
{
$aItemsPerPage = array(25, 50, 100, 200);
$iDefaultPerPage = 25;

4
include/version_queue.php
View File

@@ -214,9 +214,9 @@ class version_queue
/* $this->oVersion->displayAddItemHelp(); */
}
function objectGetItemsPerPage($bQueued = false)
function objectGetItemsPerPage($sState = 'accepted')
{
return $this->oVersion->objectGetItemsPerPage($bQueued);
return $this->oVersion->objectGetItemsPerPage($sState);
}
function objectGetEntriesCount($bQueued, $bRejected)