Changeset 393

Timestamp:

01/19/2006 11:20:05 AM (3 years ago)

Author:

xue

Message:

generated pradolite.php for alpha release.

Location:

trunk/framework

Files:

• Web/UI/WebControls/TDataGrid.php (modified) (1 diff)
• Web/UI/WebControls/TDataGridColumn.php (modified) (1 diff)
• Web/UI/WebControls/TImageButton.php (modified) (1 diff)
• pradolite.php (modified) (6 diffs)

trunk/framework/Web/UI/WebControls/TDataGrid.php

@@ -791 +791 @@
                         $ds->setDataSource(new TDummyDataSource($itemCount));
                 else
-                        $ds->setDataSource(new TDummyDataSource($this->getViewState('DataSourceCount',0));
+                        $ds->setDataSource(new TDummyDataSource($this->getViewState('DataSourceCount',0)));
 
                 $columns=new TList($this->getColumns());

trunk/framework/Web/UI/WebControls/TDataGridColumn.php

@@ -197 +197 @@
         }
 
-        protected function loadState($state)
+        public function loadState($state)
         {
                 $this->_viewState=$state;
         }
 
-        protected function saveState()
+        public function saveState()
         {
                 return $this->_viewState;

trunk/framework/Web/UI/WebControls/TImageButton.php

@@ -107 +107 @@
          * @return TPostBackOptions parameters about how the button defines its postback behavior.
          */
-        protected function getPostBackOptions()
+        public function getPostBackOptions()
         {
                 $options=new TPostBackOptions();

trunk/framework/pradolite.php

@@ -7167 +7167 @@
                 parent::addAttributesToRender($writer); 
         }
-protected function getPostBackOptions() 
+public function getPostBackOptions() 
         { 
                 $options=new TPostBackOptions(); 
@@ -7323 +7323 @@
         { 
                 $options['CausesValidation'] = $this->getCausesValidation(); 
-                $options['ValidationGroup'] = $this->getValidationGroup();               
+                $options['ValidationGroup'] = $this->getValidationGroup(); 
                 $options['PostBackUrl'] = $this->getPostBackUrl(); 
                 $options['ClientSubmit'] = !$this->getUseSubmitBehavior();
@@ -9234 +9234 @@
                 } 
                 else if(is_array($value)) 
-                        return new TList($value); 
+                        return new TMap($value); 
                 else if(($value instanceof Traversable) || $value===null) 
                         return $value; 
@@ -9771 +9771 @@
                         $valueField=1; 
                 $textFormat=$this->getDataTextFormatString(); 
-                foreach($data as $object) 
+                foreach($data as $key=>$object) 
                 { 
                         $item=new TListItem; 
-                        if(isset($object[$textField])) 
+                        if(!is_string($object) && isset($object[$textField])) 
                                 $text=$object[$textField]; 
                         else 
                                 $text=TPropertyValue::ensureString($object); 
                         $item->setText($textFormat===''?$text:sprintf($textFormat,$text)); 
-                        if(isset($object[$valueField])) 
+                        if(!is_string($object) && isset($object[$valueField])) 
                                 $item->setValue($object[$valueField]); 
+                        else if(!is_integer($key)) 
+                                $item->setValue($key); 
                         $items->add($item); 
                 } 
@@ -13188 +13190 @@
                         $ds->setDataSource(new TDummyDataSource($itemCount)); 
                 else 
-                        $ds->setDataSource(new TDummyDataSource($this->getViewState('DataSourceCount',0));
+                        $ds->setDataSource(new TDummyDataSource($this->getViewState('DataSourceCount',0)));
 $columns=new TList($this->getColumns()); 
                 $columns->mergeWith($this->_autoColumns);
@@ -13891 +13893 @@
                         $this->_viewState[$key]=$value; 
         }
-protected function loadState($state) 
+public function loadState($state) 
         { 
                 $this->_viewState=$state; 
         }
-protected function saveState() 
+public function saveState() 
         { 
                 return $this->_viewState;