MAGETWO-57963: The product page doesn't show all the fields for Product Details - for mainline

-- fixes after CR

Author: vnayda

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -1152,7 +1152,7 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
         } catch (DuplicateException $e) {
             $this->rollBack();
             $object->setHasDataChanges(true);
-            throw new AlreadyExistsException();
+            throw new AlreadyExistsException(__('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $this->rollBack();
             $object->setHasDataChanges(true);

app/code/Magento/Eav/Model/Entity/Attribute/AttributeGroupAlreadyExistsException.php

@@ -6,22 +6,10 @@
 namespace Magento\Eav\Model\Entity\Attribute;
 
 use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Phrase;
 
 /**
- * Class AlreadyExistsException
+ * Class AttributeGroupAlreadyExistsException
  */
 class AttributeGroupAlreadyExistsException extends AlreadyExistsException
 {
-    /**
-     * @param Phrase $phrase
-     * @param \Exception $cause
-     */
-    public function __construct(Phrase $phrase = null, \Exception $cause = null)
-    {
-        if ($phrase === null) {
-            $phrase = new Phrase('Attribute group with same code is already exist. Please enter other Group name');
-        }
-        parent::__construct($phrase, $cause);
-    }
 }

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Group.php

@@ -143,7 +143,12 @@ protected function saveNewObject(AbstractModel $object)
         try {
             return parent::saveNewObject($object);
         } catch (DuplicateException $e) {
-            throw new AttributeGroupAlreadyExistsException();
+            throw new AttributeGroupAlreadyExistsException(
+                __(
+                    'Attribute group with same code already exist. Please rename "%1" group',
+                    $object->getAttributeGroupName()
+                )
+            );
         }
     }
 
@@ -155,7 +160,12 @@ protected function updateObject(AbstractModel $object)
         try {
             return parent::updateObject($object);
         } catch (DuplicateException $e) {
-            throw new AttributeGroupAlreadyExistsException();
+            throw new AttributeGroupAlreadyExistsException(
+                __(
+                    'Attribute group with same code already exist. Please rename "%1" group',
+                    $object->getAttributeGroupName()
+                )
+            );
         }
     }
 }

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Set/SaveTest.php

@@ -37,7 +37,7 @@ public function testAlreadyExistsExceptionProcessingWhenGroupCodeIsDuplicated()
         $this->assertNotNull($jsonResponse);
         $this->assertEquals(1, $jsonResponse->error);
         $this->assertContains(
-            'Attribute group with same code is already exist. Please enter other Group name',
+            'Attribute group with same code already exist. Please rename "attribute-group-name" group',
             $jsonResponse->message
         );
     }

lib/internal/Magento/Framework/EntityManager/Operation/Create.php

@@ -118,7 +118,7 @@ public function execute($entity, $arguments = [])
             $connection->commit();
         } catch (DuplicateException $e) {
             $connection->rollBack();
-            throw new AlreadyExistsException();
+            throw new AlreadyExistsException(__('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $connection->rollBack();
             throw $e;

lib/internal/Magento/Framework/EntityManager/Operation/Update.php

@@ -117,7 +117,7 @@ public function execute($entity, $arguments = [])
             $connection->commit();
         } catch (DuplicateException $e) {
             $connection->rollBack();
-            throw new AlreadyExistsException();
+            throw new AlreadyExistsException(__('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $connection->rollBack();
             throw $e;

lib/internal/Magento/Framework/Exception/AlreadyExistsException.php

@@ -19,7 +19,7 @@ class AlreadyExistsException extends LocalizedException
     public function __construct(Phrase $phrase = null, \Exception $cause = null)
     {
         if ($phrase === null) {
-            $phrase = new Phrase('Database duplicate value found');
+            $phrase = new Phrase('Unique constraint violation found');
         }
         parent::__construct($phrase, $cause);
     }

lib/internal/Magento/Framework/Model/ResourceModel/Db/AbstractDb.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\DB\Adapter\DuplicateException;
+use Magento\Framework\Phrase;
 
 /**
  * Abstract resource model class
@@ -414,7 +415,7 @@ public function save(\Magento\Framework\Model\AbstractModel $object)
         } catch (DuplicateException $e) {
             $this->rollBack();
             $object->setHasDataChanges(true);
-            throw new AlreadyExistsException();
+            throw new AlreadyExistsException(new Phrase('Unique constraint violation found'), $e);
         } catch (\Exception $e) {
             $this->rollBack();
             $object->setHasDataChanges(true);