From 6578bd35e91bfe758aee1121512b6eb5e9f36fe5 Mon Sep 17 00:00:00 2001 From: cornernote Date: Mon, 19 May 2014 17:59:42 +0930 Subject: [PATCH] fix when enableAuditField is set to in behavior options, fixes #7 --- audit/components/AuditFieldBehavior.php | 36 ++++++++++++++++--------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/audit/components/AuditFieldBehavior.php b/audit/components/AuditFieldBehavior.php index e170d82..b25a871 100644 --- a/audit/components/AuditFieldBehavior.php +++ b/audit/components/AuditFieldBehavior.php @@ -26,9 +26,11 @@ class AuditFieldBehavior extends CActiveRecordBehavior /** * Set to false if you just want to use getDbAttribute and other methods in this class. * If left unset the value will come from AuditModule::enableAuditField + * @see getEnableAuditField() + * @see setEnableAuditField() * @var bool */ - public $enableAuditField; + private $_enableAuditField; /** * Any additional models you want to use to write model and model_id audits to. If this array is not empty then @@ -49,18 +51,6 @@ class AuditFieldBehavior extends CActiveRecordBehavior */ private $_dbAttributes = array(); - /** - * - */ - public function __construct() - { - if ($this->enableAuditField === null) { - /** @var AuditModule $audit */ - $audit = Yii::app()->getModule('audit'); - $this->enableAuditField = $audit->enableAuditField; - } - } - /** * A list of fields to be ignored on update and delete * @var array @@ -337,4 +327,24 @@ protected function getModelPrimaryKeyString($model) return is_array($model->getPrimaryKey()) ? implode('-', $model->getPrimaryKey()) : $model->getPrimaryKey(); } + /** + * + */ + public function getEnableAuditField() + { + if ($this->_enableAuditField === null) { + /** @var AuditModule $audit */ + $audit = Yii::app()->getModule('audit'); + $this->_enableAuditField = $audit->enableAuditField; + } + } + + /** + * @param $enableAuditField + */ + public function setEnableAuditField($enableAuditField) + { + $this->_enableAuditField = $enableAuditField; + } + }