Merge remote-tracking branch 'origin/ENGCOM-7151-magento-magento2-26075' into 2.4-develop-prs

slavvka · slavvka · commit 5d86c5d01843 · 2020-03-27T14:18:16.000-05:00
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php
@@ -84,6 +84,10 @@ public function __construct(
      */
     public function getElementHtml()
     {
+        if ($this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {
+            $this->weightSwitcher->setValue(WeightResolver::HAS_WEIGHT);
+        }
+
         if ($this->getDisabled()) {
             $this->weightSwitcher->setDisabled($this->getDisabled());
         }

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,10 @@ public function __construct(`
`84`	`84`	`*/`
`85`	`85`	`public function getElementHtml()`
`86`	`86`	`{`
	`87`	`+ if ($this->getForm()->getDataObject()->getTypeInstance()->hasWeight()) {`
	`88`	`+ $this->weightSwitcher->setValue(WeightResolver::HAS_WEIGHT);`
	`89`	`+ }`
	`90`	`+`
`87`	`91`	`if ($this->getDisabled()) {`
`88`	`92`	`$this->weightSwitcher->setDisabled($this->getDisabled());`
`89`	`93`	`}`