Change of AR due to introduction of column mapping.

2 files changed, 5 insertions, 5 deletions

diff --git a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
index 1df0910b..f189e642 100644
--- a/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php
@@ -68,7 +68,7 @@ class TScaffoldInputBase
 		if($this->getIsEnabled($column, $record))
 		{
 			$prop = $column->getColumnId();
-			$record->{$prop} = $this->getControlValue($item->_input, $column, $record);
+			$record->setColumnValue($prop, $this->getControlValue($item->_input, $column, $record));
 		}
 	}
 
@@ -80,7 +80,7 @@ class TScaffoldInputBase
 
 	protected function getRecordPropertyValue($column, $record)
 	{
-		$value = $record->{$column->getColumnId()};
+		$value = $record->getColumnValue($column->getColumnId());
 		if($column->getDefaultValue()!==TDbTableColumn::UNDEFINED_VALUE && $value===null)
 			return $column->getDefaultValue();
 		else
@@ -89,7 +89,7 @@ class TScaffoldInputBase
 
 	protected function setRecordPropertyValue($item, $record, $input)
 	{
-		$record->{$item->getCustomData()} = $input->getText();
+		$record->setColumnValue($item->getCustomData(), $input->getText());
 	}
 
 	protected function createControl($container, $column, $record)
diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
index 503bbb5e..c233cab4 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldBase.php
@@ -55,7 +55,7 @@ abstract class TScaffoldBase extends TTemplateControl
 	{

 		$data = array();

 		foreach($this->getTableInfo()->getColumns() as $name=>$column)

-			$data[] = $record->{$name};

+			$data[] = $record->getColumnValue($name);

 		return $data;

 	}

 

@@ -68,7 +68,7 @@ abstract class TScaffoldBase extends TTemplateControl
 		foreach($this->getTableInfo()->getColumns() as $name=>$column)

 		{

 			if($column->getIsPrimaryKey())

-				$data[] = $record->{$name};

+				$data[] = $record->getColumnValue($name);

 		}

 		return $data;

 	}