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

objectManager: Get rid of bIsQueue and bIsRejected members

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2008-01-03 15:50:29 +01:00
committed by Chris Morgan
parent 47f150b4ce
commit 93f59469f8
1 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
include/objectManager.php
View File

@@ -8,10 +8,8 @@ define("PREVIEW_ENTRY", 2);
class ObjectManager class ObjectManager
{ {
private $sClass; private $sClass;
private $bIsQueue;
private $sTitle; private $sTitle;
private $iId; private $iId;
private $bIsRejected;
private $sState; private $sState;
private $sReturnTo; private $sReturnTo;
private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */ private $sReturnToTitle; /* Used to preserve the title when processing entries from a queue list, for instance */
@@ -72,7 +70,7 @@ class ObjectManager
public function getIsQueue() public function getIsQueue()
{ {
return $this->bIsQueue; return $this->sState != 'accepted';
} }
public function setReturnTo($sReturnTo) public function setReturnTo($sReturnTo)
@@ -212,7 +210,7 @@ class ObjectManager
$oTableRowClick->SetHighlight($oTableRowHighlight); $oTableRowClick->SetHighlight($oTableRowHighlight);
} }
$sEditLinkLabel = $this->bIsQueue ? "process" : "edit"; $sEditLinkLabel = $this->getIsQueue() ? 'process' : 'edit';
/* We add some action links */ /* We add some action links */
if($oObject->canEdit()) if($oObject->canEdit())
@@ -242,9 +240,9 @@ class ObjectManager
"objectGetTableRow", "objectGetId", "canEdit")); "objectGetTableRow", "objectGetId", "canEdit"));
/* We cannot process a queue if we are not logged in */ /* We cannot process a queue if we are not logged in */
if(!$_SESSION['current']->isLoggedIn() && $this->bIsQueue) if(!$_SESSION['current']->isLoggedIn() && $this->getIsQueue())
{ {
$sQueueText = $this->bIsRejected ? "rejected" : "queued"; $sQueueText = $this->sState == 'rejected' ? "rejected" : "queued";
echo '<div align="center">You need to '; echo '<div align="center">You need to ';
echo "log in in order to process $sQueueText entries</div>\n"; echo "log in in order to process $sQueueText entries</div>\n";
login_form(false); login_form(false);
@@ -265,7 +263,7 @@ class ObjectManager
$this->setSortInfo($aClean); $this->setSortInfo($aClean);
/* query the class for its entries */ /* query the class for its entries */
/* We pass in $this->bIsQueue to tell the object */ /* We pass in queue states to tell the object */
/* if we are requesting a list of its queued objects or */ /* if we are requesting a list of its queued objects or */
/* all of its objects */ /* all of its objects */
if($this->oMultiPage->bEnabled) if($this->oMultiPage->bEnabled)
@@ -273,14 +271,14 @@ class ObjectManager
/* Has the user chosen a particular field to sort by? If not we want to use the default */ /* Has the user chosen a particular field to sort by? If not we want to use the default */
if($this->oSortInfo->sCurrentSort) if($this->oSortInfo->sCurrentSort)
{ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected',
$this->oMultiPage->iItemsPerPage, $this->oMultiPage->iItemsPerPage,
$this->oMultiPage->iLowerLimit, $this->oMultiPage->iLowerLimit,
$this->oSortInfo->sCurrentSort, $this->oSortInfo->sCurrentSort,
$this->oSortInfo->bAscending); $this->oSortInfo->bAscending);
} else } else
{ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected',
$this->oMultiPage->iItemsPerPage, $this->oMultiPage->iItemsPerPage,
$this->oMultiPage->iLowerLimit); $this->oMultiPage->iLowerLimit);
} }
@@ -289,19 +287,19 @@ class ObjectManager
/* Has the user chosen a particular field to sort by? If not we want to use the default */ /* Has the user chosen a particular field to sort by? If not we want to use the default */
if($this->oSortInfo->sCurrentSort) if($this->oSortInfo->sCurrentSort)
{ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected, $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected',
$this->oSortInfo->sCurrentSort, $this->oSortInfo->sCurrentSort,
$this->oSortInfo->bAscending); $this->oSortInfo->bAscending);
} else } else
{ {
$hResult = $oObject->objectGetEntries($this->bIsQueue, $this->bIsRejected); $hResult = $oObject->objectGetEntries($this->getIsQueue(), $this->sState == 'rejected');
} }
} }
/* did we get any entries? */ /* did we get any entries? */
if(!$hResult || query_num_rows($hResult) == 0) if(!$hResult || query_num_rows($hResult) == 0)
{ {
switch($this->getQueueString($this->bIsQueue, $this->bIsRejected)) switch($this->getQueueString($this->getIsQueue(), $this->sState == 'rejected'))
{ {
case "true": case "true":
echo "<center>The queue for '$this->sClass' is empty</center>"; echo "<center>The queue for '$this->sClass' is empty</center>";
@@ -334,7 +332,7 @@ class ObjectManager
echo '</div>'; echo '</div>';
} }
$sQueued = $this->getQueueString($this->bIsQueue, $this->bIsRejected); $sQueued = $this->getQueueString($this->getIsQueue(), $this->sState == 'rejected');
/* Should we let the class draw its own custom table? */ /* Should we let the class draw its own custom table? */
if(method_exists($this->sClass, 'objectWantCustomDraw') && if(method_exists($this->sClass, 'objectWantCustomDraw') &&
@@ -411,7 +409,7 @@ class ObjectManager
/* if this is a queue add a dialog for replying to the submitter of the /* if this is a queue add a dialog for replying to the submitter of the
queued entry */ queued entry */
if($this->bIsQueue || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) if($this->getIsQueue() || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId))
{ {
/* If it isn't implemented, that means there is no default text */ /* If it isn't implemented, that means there is no default text */
$sDefaultReply = $this->getOptionalSetting("getDefaultReply", ""); $sDefaultReply = $this->getOptionalSetting("getDefaultReply", "");
@@ -422,7 +420,7 @@ class ObjectManager
echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '. echo '<td><textarea name="sReplyText" style="width: 100%" cols="80" '.
'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n"; 'rows="10">'.$sDefaultReply.'</textarea></td></tr>',"\n";
if($this->bIsQueue) if($this->getIsQueue())
{ {
///////////////////////////////////////////////// /////////////////////////////////////////////////
// output radio buttons for some common responses // output radio buttons for some common responses
@@ -457,7 +455,7 @@ class ObjectManager
'class="button" />',"\n"; 'class="button" />',"\n";
} }
if(!$this->bIsRejected && !$this->getOptionalSetting("objectHideReject", FALSE)) if($this->sState != 'rejected' && !$this->getOptionalSetting("objectHideReject", FALSE))
{ {
echo '<input name="sSubmit" type="submit" value="Reject" class="button" '. echo '<input name="sSubmit" type="submit" value="Reject" class="button" '.
'/>',"\n"; '/>',"\n";
@@ -1162,10 +1160,10 @@ class ObjectManager
if(!$oOriginalObject->canEdit()) if(!$oOriginalObject->canEdit())
return FALSE; return FALSE;
if($this->bIsRejected) if($this->sState == 'rejected')
$oObject->ReQueue(); $oObject->ReQueue();
if($this->bIsQueue && !$oOriginalObject->mustBeQueued()) if($this->getIsQueue() && !$oOriginalObject->mustBeQueued())
$oObject->unQueue(); $oObject->unQueue();
$oObject->update(); $oObject->update();
@@ -1202,7 +1200,7 @@ class ObjectManager
/* Displaying the entire un-queued list for a class is not a good idea, /* Displaying the entire un-queued list for a class is not a good idea,
so only do so for queued data */ so only do so for queued data */
if($this->bIsQueue) if($this->getIsQueue())
$sRedirectLink = $this->makeUrl("view", false, $this->sReturnToTitle ? $this->sReturnToTitle : "$this->sClass list"); $sRedirectLink = $this->makeUrl("view", false, $this->sReturnToTitle ? $this->sReturnToTitle : "$this->sClass list");
else else
$sRedirectLink = APPDB_ROOT; $sRedirectLink = APPDB_ROOT;
@@ -1217,9 +1215,9 @@ class ObjectManager
{ {
$sUrl = APPDB_ROOT."objectManager.php?"; $sUrl = APPDB_ROOT."objectManager.php?";
$sIsQueue = $this->bIsQueue ? "true" : "false"; $sIsQueue = $this->getIsQueue() ? "true" : "false";
$sUrl .= "bIsQueue=$sIsQueue"; $sUrl .= "bIsQueue=$sIsQueue";
$sIsRejected = $this->bIsRejected ? "true" : "false"; $sIsRejected = $this->sState == 'rejected' ? "true" : "false";
$sUrl .= "&bIsRejected=$sIsRejected"; $sUrl .= "&bIsRejected=$sIsRejected";
$sUrl .= "&sClass=".$this->sClass; $sUrl .= "&sClass=".$this->sClass;
@@ -1259,8 +1257,8 @@ class ObjectManager
is preserved when submitting forms */ is preserved when submitting forms */
public function makeUrlFormData() public function makeUrlFormData()
{ {
$sIsQueue = $this->bIsQueue ? "true" : "false"; $sIsQueue = $this->getIsQueue() ? "true" : "false";
$sIsRejected = $this->bIsRejected ? "true" : "false"; $sIsRejected = $this->sState == 'rejected' ? "true" : "false";
$sReturn = "<input type=\"hidden\" name=\"bIsQueue\" value=\"$sIsQueue\" />\n"; $sReturn = "<input type=\"hidden\" name=\"bIsQueue\" value=\"$sIsQueue\" />\n";
$sReturn .= "<input type=\"hidden\" name=\"bIsRejected\" value=\"$sIsRejected\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"bIsRejected\" value=\"$sIsRejected\" />\n";
@@ -1306,7 +1304,7 @@ class ObjectManager
/* Add an action column if the user can edit this class, or if it is a queue. /* Add an action column if the user can edit this class, or if it is a queue.
Even though a user annot process items, he can edit his queued submissions */ Even though a user annot process items, he can edit his queued submissions */
if($oObject->canEdit() || $this->bIsQueue) if($oObject->canEdit() || $this->getIsQueue())
{ {
$oTableRow->AddTextCell("Action"); $oTableRow->AddTextCell("Action");
} }
@@ -1371,7 +1369,7 @@ class ObjectManager
$sControls .= "</form></p>"; $sControls .= "</form></p>";
} }
$iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected); $iTotalEntries = $oObject->objectGetEntriesCount($this->getIsQueue(), $this->sState == 'rejected');
$iNumPages = ceil($iTotalEntries / $iItemsPerPage); $iNumPages = ceil($iTotalEntries / $iItemsPerPage);
if($iNumPages == 0) if($iNumPages == 0)
$iNumPages = 1; $iNumPages = 1;