Merge remote-tracking branch 'origin/MAGETWO-54102' into bugfixes

Natalia Momotenko · Natalia Momotenko · commit d1914d064e97 · 2016-06-23T16:44:05.000+03:00
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php
@@ -314,9 +314,7 @@ public function addContainerChildren(
             ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),
             $attributeContainer,
             [
-                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,
-                // TODO: Eliminate this in scope of MAGETWO-51364
-                'scopeLabel' => $this->getScopeLabel($attribute),
+                'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER
             ]
         );
 

Original file line number	Diff line number	Diff line change
`@@ -314,9 +314,7 @@ public function addContainerChildren(`
`314`	`314`	`ltrim(static::META_CONFIG_PATH, ArrayManager::DEFAULT_PATH_DELIMITER),`
`315`	`315`	`$attributeContainer,`
`316`	`316`	`[`
`317`		`- 'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER,`
`318`		`- // TODO: Eliminate this in scope of MAGETWO-51364`
`319`		`- 'scopeLabel' => $this->getScopeLabel($attribute),`
	`317`	`+ 'sortOrder' => $sortOrder * self::SORT_ORDER_MULTIPLIER`
`320`	`318`	`]`
`321`	`319`	`);`
`322`	`320`