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

CHANGELOG.md

@@ -1,3 +1,15 @@
+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>
+
 CHANGELOG for 1.4.0
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.4.0 versions.

src/Oro/Bundle/DataGridBundle/Resources/public/js/datagrid/action/abstract-action.js

@@ -175,12 +175,13 @@ define([
             if (this.dispatched) {
                 return;
             }
-            this.frontend_options.url = this.frontend_options.url || this.getLinkWithParameters();
+            this.frontend_options = this.frontend_options || {};
+            this.frontend_options.url = this.getLinkWithParameters();
             this.frontend_options.title = this.frontend_options.title || this.label;
-            require(['oro/' + this.frontend_handle + '-widget'], function (WidgetType) {
+            require(['oro/' + this.frontend_handle + '-widget'], _.bind(function (WidgetType) {
                 var widget = new WidgetType(this.frontend_options);
                 widget.render();
-            });
+            }, this));
         },
 
         _handleRedirect: function () {

src/Oro/Bundle/EntityBundle/ORM/DoctrineHelper.php

@@ -3,6 +3,7 @@
 namespace Oro\Bundle\EntityBundle\ORM;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
@@ -144,6 +145,18 @@ public function getEntityManager($entityOrClass)
         return $entityManager;
     }
 
+    /**
+     * @param string|object $entityOrClass
+     * @return ObjectRepository
+     */
+    public function getEntityRepository($entityOrClass)
+    {
+        $entityClass = $this->getEntityClass($entityOrClass);
+        $entityManager = $this->getEntityManager($entityClass);
+
+        return $entityManager->getRepository($entityClass);
+    }
+
     /**
      * @param string $entityClass
      * @param mixed  $entityId