Merge pull request #1128 from magento-tsg/2.0.15-develop-pr14

[TSG] Backporting for 2.0 (pr14) (2.0.15)
magento · May 23, 2017 · 22c402d · 22c402d
2 parents 1e9b79a + 7eb366d
commit 22c402d
Show file tree

Hide file tree

Showing 70 changed files with 2,936 additions and 659 deletions.
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php
@@ -16,6 +16,8 @@
 use Magento\Backend\Block\Widget\Form\Generic;
 use Magento\Config\Model\Config\Source\Yesno;
 use Magento\Eav\Helper\Data;
+use Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker;
+use Magento\Framework\App\ObjectManager;
 
 class Advanced extends Generic
 {
@@ -36,6 +38,13 @@ class Advanced extends Generic
      */
     protected $disableScopeChangeList;
 
+    /**
+     * Disable form fields.
+     *
+     * @var \Magento\Eav\Block\Adminhtml\Attribute\PropertyLocker PropertyLocker
+     */
+    private $propertyLocker;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -241,6 +250,8 @@ protected function _prepareForm()
             $form->getElement('is_global')->setDisabled(1);
         }
         $this->setForm($form);
+        $this->getPropertyLocker()->lock($form);
+
         return $this;
     }
 
@@ -264,4 +275,18 @@ private function getAttributeObject()
     {
         return $this->_coreRegistry->registry('entity_attribute');
     }
+
+    /**
+     * Get property locker.
+     *
+     * @return PropertyLocker
+     */
+    private function getPropertyLocker()
+    {
+        if (null === $this->propertyLocker) {
+            $this->propertyLocker = ObjectManager::getInstance()->get(PropertyLocker::class);
+        }
+
+        return $this->propertyLocker;
+    }
 }
diff --git a/app/code/Magento/Catalog/Block/Product/View/Gallery.php b/app/code/Magento/Catalog/Block/Product/View/Gallery.php
@@ -63,15 +63,13 @@ public function getGalleryImages()
                 );
                 $image->setData(
                     'medium_image_url',
-                    $this->_imageHelper->init($product, 'product_page_image_medium')
-                        ->constrainOnly(true)->keepAspectRatio(true)->keepFrame(false)
+                    $this->_imageHelper->init($product, 'product_page_image_medium_no_frame')
                         ->setImageFile($image->getFile())
                         ->getUrl()
                 );
                 $image->setData(
                     'large_image_url',
-                    $this->_imageHelper->init($product, 'product_page_image_large')
-                        ->constrainOnly(true)->keepAspectRatio(true)->keepFrame(false)
+                    $this->_imageHelper->init($product, 'product_page_image_large_no_frame')
                         ->setImageFile($image->getFile())
                         ->getUrl()
                 );

diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
@@ -241,28 +241,29 @@ protected function setWatermarkProperties()
     {
         $this->setWatermark(
             $this->scopeConfig->getValue(
-                "design/watermark/{$this->_getModel()->getDestinationSubdir()}_image",
+                "design/watermark/{$this->getType()}_image",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkImageOpacity(
             $this->scopeConfig->getValue(
-                "design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity",
+                "design/watermark/{$this->getType()}_imageOpacity",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkPosition(
             $this->scopeConfig->getValue(
-                "design/watermark/{$this->_getModel()->getDestinationSubdir()}_position",
+                "design/watermark/{$this->getType()}_position",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkSize(
             $this->scopeConfig->getValue(
-                "design/watermark/{$this->_getModel()->getDestinationSubdir()}_size",
+                "design/watermark/{$this->getType()}_size",
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
+
         return $this;
     }
 
@@ -496,14 +497,14 @@ protected function initBaseFile()
      */
     protected function isScheduledActionsAllowed()
     {
+        $isAllowed = true;
         $model = $this->_getModel();
-        if ($model->isBaseFilePlaceholder()
-            && $model->getNewFile() === true
-            || $model->isCached()
-        ) {
-            return false;
+
+        if ($model->isBaseFilePlaceholder() || $model->isCached()) {
+            $isAllowed =  false;
         }
-        return true;
+
+        return $isAllowed;
     }
 
     /**