Skip to content
Permalink
Browse files

adding a plugin propery to models wwith tests for ticket #85

Merge pull request #696
  • Loading branch information...
dogmatic69 authored and markstory committed Jun 19, 2012
1 parent 268e589 commit 6d4f4b57d76cd733ed0ecc39f4b97f343a14642e
@@ -235,6 +235,13 @@ class Model extends Object implements CakeEventListener {
*/
public $tablePrefix = null;
/**
* Plugin model belongs to.
*
* @var string
*/
public $plugin = null;
/**
* Name of the model.
*
@@ -665,12 +672,16 @@ public function __construct($id = false, $table = null, $ds = null) {
extract(array_merge(
array(
'id' => $this->id, 'table' => $this->useTable, 'ds' => $this->useDbConfig,
'name' => $this->name, 'alias' => $this->alias
'name' => $this->name, 'alias' => $this->alias, 'plugin' => $this->plugin
),
$id
));
}
if ($this->plugin === null) {
$this->plugin = (isset($plugin) ? $plugin : $this->plugin);
}
if ($this->name === null) {
$this->name = (isset($name) ? $name : get_class($this));
}
@@ -1667,6 +1667,14 @@ public function testIdentity() {
$result = $TestModel->alias;
$expected = 'AnotherTest';
$this->assertEquals($expected, $result);
$TestModel = ClassRegistry::init('Test');
$expected = null;
$this->assertEquals($expected, $TestModel->plugin);
$TestModel = ClassRegistry::init('TestPlugin.TestPluginComment');
$expected = 'TestPlugin';
$this->assertEquals($expected, $TestModel->plugin);
}
/**
@@ -124,6 +124,7 @@ public static function init($class, $strict = false) {
list($plugin, $class) = pluginSplit($class);
if ($plugin) {
$pluginPath = $plugin . '.';
$settings['plugin'] = $plugin;
}
if (empty($settings['alias'])) {

0 comments on commit 6d4f4b5

Please sign in to comment.
You can’t perform that action at this time.