Merge remote-tracking branch 'remotes/dev/1.4' into 1.4

oroinc · Dec 5, 2014 · 8647355 · 8647355
2 parents b36e61b + e12bf2f
commit 8647355
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,27 +1,34 @@
+CHANGELOG for 1.4.3
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.4.3 versions.
+* 1.4.3 (2014-12-05)
+ * List of improvements and fixed bugs
+ - Fixed extended entity is set to "false" after oro:entity-config:update with force
+
 CHANGELOG for 1.4.2
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.4.2 versions.
 * 1.4.2 (2014-12-02)
  * List of improvements and fixed bugs
- <ul><li>Implemented form type guessers for custom fields of existing entities</li>
- <li>Added support of cascade option for association in Extend Extension</li>
- <li>Fixed insecure content from websockets when HTTPS used</li>
- <li>Fixed IMAP Sync with date parsing exception</li>
- <li>Magento Integration: Sensitive data displayed in API request logs</li>
- <li>Magento Integration: Memory Issue on Error</li>
- <li>Magento Integration: Duplicated jobs on two way Magento sync</li></ul>
+ - Implemented form type guessers for custom fields of existing entities
+ - Added support of cascade option for association in Extend Extension
+ - Fixed insecure content from websockets when HTTPS used
+ - Fixed IMAP Sync with date parsing exception
+ - Magento Integration: Sensitive data displayed in API request logs
+ - Magento Integration: Memory Issue on Error
+ - Magento Integration: Duplicated jobs on two way Magento sync
 
 CHANGELOG for 1.4.1
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.4.1 versions.
 * 1.4.1 (2014-11-17)
  * List of improvements and fixed bugs
- <ul><li>Refactor extended entity to prevent class name collisions</li>
- <li>Implement form type guessers for custom fields of existing entities</li>
- <li>Use route from config in email address link to avoid potential errors</li>
- <li>Fixed duplicates of entities during magento import</li>
- <li>Error in "oro_multiple_entity" if it's used without "default_element" option</li>
- <li>Lost organization name after upgrade</li></ul>
+ - Refactor extended entity to prevent class name collisions
+ - Implement form type guessers for custom fields of existing entities
+ - Use route from config in email address link to avoid potential errors
+ - Fixed duplicates of entities during magento import
+ - Error in "oro_multiple_entity" if it's used without "default_element" option
+ - Lost organization name after upgrade
 
 CHANGELOG for 1.4.0
 ===================

diff --git a/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php b/src/Oro/Bundle/EntityExtendBundle/EventListener/ConfigSubscriber.php
@@ -83,13 +83,22 @@ public function persistConfig(PersistConfigEvent $event)
      */
     public function updateEntityConfig(EntityConfigEvent $event)
     {
-        $parentClassName = get_parent_class($event->getClassName());
+        $className = $event->getClassName();
+        $parentClassName = get_parent_class($className);
         if (!$parentClassName) {
             return;
         }
-        $shortClassName = ExtendHelper::getShortClassName($event->getClassName());
-        if (ExtendHelper::getShortClassName($parentClassName) !== 'Extend' . $shortClassName) {
-            return;
+
+        if (ExtendHelper::isExtendEntityProxy($parentClassName)) {
+            // When application is installed parent class will be replaced (via class_alias)
+            $extendClass = $parentClassName;
+        } else {
+            // During install parent class is not replaced (via class_alias)
+            $shortClassName = ExtendHelper::getShortClassName($event->getClassName());
+            if (ExtendHelper::getShortClassName($parentClassName) !== 'Extend' . $shortClassName) {
+                return;
+            }
+            $extendClass = ExtendHelper::getExtendEntityProxyClassName($parentClassName);
         }
 
         $config = $event->getConfigManager()->getProvider('extend')->getConfig($event->getClassName());
@@ -98,7 +107,6 @@ public function updateEntityConfig(EntityConfigEvent $event)
             $config->set('is_extend', true);
             $hasChanges = true;
         }
-        $extendClass = ExtendHelper::getExtendEntityProxyClassName($parentClassName);
         if (!$config->is('extend_class', $extendClass)) {
             $config->set('extend_class', $extendClass);
             $hasChanges = true;