Changeset 1515 for branches/3.0

Timestamp:

11/26/2006 02:09:44 PM (2 years ago)

Author:

xue

Message:

Fixed the bug that TPager would not display if it was invisible previously

Location:

branches/3.0

Files:

• HISTORY (modified) (1 diff)
• framework/Web/UI/WebControls/TPager.php (modified) (3 diffs)

branches/3.0/HISTORY

@@ -5 +5 @@
 BUG: TTableCell should render   only when Text is not set and there's no child (Qiang)
 BUG: global state was not saved when redirect() is invoked (Qiang)
+BUG: TPager would not display if it was invisible previously (Qiang)
 ENH: Ticket#446 - Added TMetaTagCollection.getMetaTagByID method (Qiang)
 CHG: Ticket#437 - __autoload is replaced by spl_autoload_register (Qiang)

branches/3.0/framework/Web/UI/WebControls/TPager.php

@@ -52 +52 @@
         const CMD_PAGE_LAST='Last';
 
+        private $_pageCount=0;
+
         /**
          * Restores the pager state.
@@ -269 +271 @@
                         throw new TConfigurationException('pager_controltopaginate_invalid',$controlID);
 
-                if($targetControl->getAllowPaging() && $targetControl->getPageCount()>1)
-                {
-                        $this->setVisible(true);
+                if($targetControl->getAllowPaging())
+                {
+                        $this->_pageCount=$targetControl->getPageCount();
                         $this->getControls()->clear();
                         $this->setPageCount($targetControl->getPageCount());
@@ -278 +280 @@
                 }
                 else
-                        $this->setVisible(false);
+                        $this->_pageCount=0;
+        }
+
+        /**
+         * Renders the control.
+         * The method overrides the parent implementation by rendering
+         * the pager only when there are two or more pages.
+         * @param THtmlWriter the writer
+         */
+        public function render($writer)
+        {
+                if($this->_pageCount>1)
+                        parent::render($writer);
         }