appdb/include objectManager.php
WineHQ
wineowner at wine.codeweavers.com
Thu Aug 23 21:10:23 CDT 2007
ChangeSet ID: 31339
CVSROOT: /opt/cvs-commit
Module name: appdb
Changes by: wineowner at winehq.org 2007/08/23 21:10:23
Modified files:
include : objectManager.php
Log message:
Chris Morgan <cmorgan at alum.wpi.edu>
Add page selection control at the bottom of pages, without the items per-page selector. Fix
objectMananger::handleMultiPageControls() to not display the items per-page selector if
the $bItemsPerPageSelector input parameter is false.
Patch: http://cvs.winehq.org/patch.py?id=31339
Old revision New revision Changes Path
1.48 1.49 +29 -16 appdb/include/objectManager.php
Index: appdb/include/objectManager.php
diff -u -p appdb/include/objectManager.php:1.48 appdb/include/objectManager.php:1.49
--- appdb/include/objectManager.php:1.48 24 Aug 2007 2:10:23 -0000
+++ appdb/include/objectManager.php 24 Aug 2007 2:10:23 -0000
@@ -95,8 +95,8 @@ class ObjectManager
$oObject = new $this->sClass();
- /* Display selectors for items per page and current page, if applicable. The function
- returns FALSE or an array of arguments to be passed to objectGetEntries() */
+ // Display top of the page selectors for items per page and
+ // current page, if applicable.
$this->handleMultiPageControls($aClean, TRUE);
/* query the class for its entries */
@@ -192,6 +192,11 @@ class ObjectManager
echo "<br /><br /><a href=\"".$this->makeUrl("add", false,
"Add $this->sClass")."\">Add entry</a>\n";
}
+
+ // Display bottom of page selectors current page, if applicable
+ // NOTE: second parameter is false because we don't want the
+ // items per page selector appearing for the second set of page controls
+ $this->handleMultiPageControls($aClean, FALSE);
}
/* display the entry for editing */
@@ -704,24 +709,32 @@ class ObjectManager
$iItemsPerPage = $iDefaultPerPage;
- if ( isset($aClean['iItemsPerPage']) && in_array($aClean['iItemsPerPage'], $aItemsPerPage) )
+ if ( isset($aClean['iItemsPerPage']) &&
+ in_array($aClean['iItemsPerPage'], $aItemsPerPage) )
+ {
$iItemsPerPage = $aClean['iItemsPerPage'];
+ }
- $sControls = "<form action=\"".$this->makeUrl()."\" method=\"get\">";
-
- /* Fill in form data for the objectManager URL */
- $sControls .= $this->makeUrlFormData();
- $sControls .= "<p><b> Items per page</b>";
- $sControls .= "<select name=\"iItemsPerPage\" />";
+ // if $bItemsPerPageSelector is true, display the items
+ // per-page dropdown and update button
+ if($bItemsPerPageSelector)
+ {
+ $sControls = "<form action=\"".$this->makeUrl()."\" method=\"get\">";
+
+ /* Fill in form data for the objectManager URL */
+ $sControls .= $this->makeUrlFormData();
+ $sControls .= "<p><b> Items per page</b>";
+ $sControls .= "<select name=\"iItemsPerPage\" />";
- foreach($aItemsPerPage as $iNum)
- {
- $sSelected = ($iNum == $iItemsPerPage) ? ' selected="selected"' : "";
- $sControls .= "<option$sSelected>$iNum</option>";
+ foreach($aItemsPerPage as $iNum)
+ {
+ $sSelected = ($iNum == $iItemsPerPage) ? ' selected="selected"' : "";
+ $sControls .= "<option$sSelected>$iNum</option>";
+ }
+ $sControls .= "</select>";
+ $sControls .= " <input type=\"submit\" value=\"Update\" />";
+ $sControls .= "</form></p>";
}
- $sControls .= "</select>";
- $sControls .= " <input type=\"submit\" value=\"Update\" />";
- $sControls .= "</form></p>";
$iTotalEntries = $oObject->objectGetEntriesCount($this->bIsQueue, $this->bIsRejected);
$iNumPages = ceil($iTotalEntries / $iItemsPerPage);
More information about the wine-cvs
mailing list