From 284aad42a6af396b88a366d3574c4314dd4f2814 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sun, 24 Aug 2014 22:27:07 +0300 Subject: [PATCH] since now explicit admin component creation only is allowed --- ipf/admin/app.php | 10 ---------- ipf/admin/legacymodel.php | 15 --------------- ipf/legacy_orm/orm/import/builder.php | 3 ++- 3 files changed, 2 insertions(+), 26 deletions(-) diff --git a/ipf/admin/app.php b/ipf/admin/app.php index 30a6365..0a52074 100644 --- a/ipf/admin/app.php +++ b/ipf/admin/app.php @@ -54,16 +54,6 @@ class IPF_Admin_App extends IPF_Application } } - // legacy ORM - foreach (IPF_Legacy_ORM_App::appModelList($app) as $m) { - new $m; // autoload - $ma = IPF_Admin_Model::getModelAdmin($m); - if ($ma) { - $ma->app = $app; - $components[] = $ma; - } - } - self::$appComponents[$app->slug()] = $components; } return self::$appComponents[$app->slug()]; diff --git a/ipf/admin/legacymodel.php b/ipf/admin/legacymodel.php index aaad49f..bd66841 100644 --- a/ipf/admin/legacymodel.php +++ b/ipf/admin/legacymodel.php @@ -2,21 +2,6 @@ class IPF_Admin_Model extends IPF_Admin_Component { - static $models = array(); - - public static function register($classModel, $classAdmin) - { - self::$models[$classModel] = new $classAdmin($classModel); - } - - public static function getModelAdmin($classModel) - { - if (array_key_exists($classModel, self::$models)) { - return self::$models[$classModel]; - } - return null; - } - public $modelName; public function __construct($modelName) diff --git a/ipf/legacy_orm/orm/import/builder.php b/ipf/legacy_orm/orm/import/builder.php index 7a398ad..9aaae70 100644 --- a/ipf/legacy_orm/orm/import/builder.php +++ b/ipf/legacy_orm/orm/import/builder.php @@ -374,7 +374,8 @@ class IPF_ORM_Import_Builder '{', '}', '', - 'IPF_Admin_Model::register(\''.$className.'\', \''.$adminClassName.'\');', + '// Add following line to your admin.php to enable admin interface for this model', + "new $adminClassName('$className'),", '*/', '', ); -- 2.49.0