From dec4bb5165c3eb8c20493196a7e66b58c7302e21 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Thu, 23 May 2019 18:15:22 +0200 Subject: [PATCH] Changed cacheing of attributes to be useful --- src/admin/common/abstract/model/factory.php | 8 ++++---- src/admin/common/models/factory/club.php | 2 +- src/admin/common/models/factory/place.php | 2 +- src/admin/common/models/factory/user.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/admin/common/abstract/model/factory.php b/src/admin/common/abstract/model/factory.php index baccce6..1155c6c 100644 --- a/src/admin/common/abstract/model/factory.php +++ b/src/admin/common/abstract/model/factory.php @@ -33,13 +33,13 @@ abstract class AbstractCommonClubsModelFactory * - optional: boolean, if true, the field can be NULL * - ref: (only with type='ref') The name of the class that is referenced */ - public abstract function getAttributes(); + protected abstract function fetchAttributes(); private $attributes = null; - private function fetchAttributes($force = False) + public function getAttributes($force = False) { if($this->attributes === null || $force) - $this->attributes = $this->getAttributes(); + $this->attributes = $this->fetchAttributes(); return $this->attributes; } @@ -128,7 +128,7 @@ abstract class AbstractCommonClubsModelFactory $attribs = array_map(function($v){ return Null; - }, $this->fetchAttributes()); + }, $this->getAttributes()); $obj->setValues($attribs); $obj->fillDefaultValues(); diff --git a/src/admin/common/models/factory/club.php b/src/admin/common/models/factory/club.php index e10dd2c..d3ee0c8 100644 --- a/src/admin/common/models/factory/club.php +++ b/src/admin/common/models/factory/club.php @@ -5,7 +5,7 @@ defined('_JEXEC') or die; class CommonClubsModelFactoryClub extends AbstractCommonClubsModelFactory { - public function getAttributes() + public function fetchAttributes() { return array( 'name'=>array(), diff --git a/src/admin/common/models/factory/place.php b/src/admin/common/models/factory/place.php index c8f1bd8..fcae159 100644 --- a/src/admin/common/models/factory/place.php +++ b/src/admin/common/models/factory/place.php @@ -5,7 +5,7 @@ defined('_JEXEC') or die; class CommonClubsModelFactoryPlace extends AbstractCommonClubsModelFactory { - public function getAttributes() + public function fetchAttributes() { return array( 'name'=>array(), diff --git a/src/admin/common/models/factory/user.php b/src/admin/common/models/factory/user.php index 7104187..5c55bea 100644 --- a/src/admin/common/models/factory/user.php +++ b/src/admin/common/models/factory/user.php @@ -5,7 +5,7 @@ defined('_JEXEC') or die; class CommonClubsModelFactoryUser extends AbstractCommonClubsModelFactory { - public function getAttributes() + public function fetchAttributes() { return array( 'user'=>array(),