fixed core components determination

antonCPU · Nov 6, 2012 · 87770cf · 87770cf
1 parent 369993f
commit 87770cf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/components/entity/AmEntity.php b/components/entity/AmEntity.php
@@ -35,6 +35,10 @@ class AmEntity extends AmModel
      * @var string name as it appears in the config.
      */
     protected $name;
+    /**
+     * @var string
+     */
+    protected $defaultName;
     /**
      * @var string Yii alias to the entity class.
      */
@@ -271,11 +275,24 @@ public function setName($name)
      */
     public function getDefaultName()
     {
-        $id = $this->getId();
-        $tmp = explode('.', $id);
-        $name = array_pop($tmp);
-        $name[0] = strtolower($name[0]);
-        return $name;
+        if (null === $this->defaultName) {
+            $id = $this->getId();
+            $tmp = explode('.', $id);
+            $name = array_pop($tmp);
+            $name[0] = strtolower($name[0]);
+            $this->defaultName = $name;
+        }
+        return $this->defaultName;
+    }
+
+    /**
+     * @param string $name
+     * @return AmEntity
+     */
+    public function setDefaultName($name)
+    {
+        $this->defaultName = $name;
+        return $this;
     }
 
     /**

diff --git a/models/AmEntityCoreComponents.php b/models/AmEntityCoreComponents.php
@@ -4,11 +4,11 @@ class AmEntityCoreComponents extends AmEntityComponents
 {
     public function getChild($id)
     { 
-        $components = $this->scan();
-        if (false === array_search($id, $components)) { 
+        $name = array_search($id, $this->scan());
+        if (false === $name) { 
             return null;
         }
-        return $this->createChild($id);
+        return $this->createChild($id, $name);
     }
 
     protected function scan()
@@ -45,7 +45,7 @@ protected function createChildren($results)
     protected function createChild($id, $name = null)
     {
         $entity = parent::createChild($id);
-        $entity->setName($name);
+        $entity->setDefaultName($name);
         $entity->setFullClassName($this->getParent()->getId() . '.' . $id);
         return $entity;
     }

diff --git a/models/AmEntityCoreModules.php b/models/AmEntityCoreModules.php
@@ -27,7 +27,7 @@ protected function createChildren($results)
     protected function createChild($id, $name = null)
     {
         $entity = parent::createChild($id);
-        $entity->setName($name);
+        $entity->setDefaultName($name);
         $entity->setFullClassName($this->getParent()->getId() . '.' . $id);
         return $entity;
     }