backward compatibilty fixed

magento · Mar 8, 2019 · b7ad075 · b7ad075
1 parent f80d382
commit b7ad075
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 32 deletions.
diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Links.php
@@ -208,23 +208,22 @@ protected function getRecord()
             'children',
             $record,
             [
-                'container_link_title' => $this->getTitleColumn(10),
-                'container_link_price' => $this->getPriceColumn(20),
-                'container_file' => $this->getFileColumn(30),
-                'container_sample' => $this->getSampleColumn(40),
-                'is_shareable' => $this->getShareableColumn(50),
-                'max_downloads' => $this->getMaxDownloadsColumn(60),
+                'container_link_title' => $this->getTitleColumn(),
+                'container_link_price' => $this->getPriceColumn(),
+                'container_file' => $this->getFileColumn(),
+                'container_sample' => $this->getSampleColumn(),
+                'is_shareable' => $this->getShareableColumn(),
+                'max_downloads' => $this->getMaxDownloadsColumn(),
                 'position' => $recordPosition,
                 'action_delete' => $recordActionDelete,
             ]
         );
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getTitleColumn($sortOrder)
+    protected function getTitleColumn()
     {
         $titleContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -233,7 +232,7 @@ protected function getTitleColumn($sortOrder)
             'label' => __('Title'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -249,10 +248,9 @@ protected function getTitleColumn($sortOrder)
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getPriceColumn($sortOrder)
+    protected function getPriceColumn()
     {
         $priceContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -261,7 +259,7 @@ protected function getPriceColumn($sortOrder)
             'label' => __('Price'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 20,
         ];
         $priceField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -285,10 +283,9 @@ protected function getPriceColumn($sortOrder)
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getFileColumn($sortOrder)
+    protected function getFileColumn()
     {
         $fileContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -297,7 +294,7 @@ protected function getFileColumn($sortOrder)
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 30,
         ];
         $fileTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -350,10 +347,9 @@ protected function getFileColumn($sortOrder)
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getSampleColumn($sortOrder)
+    protected function getSampleColumn()
     {
         $sampleContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -362,7 +358,7 @@ protected function getSampleColumn($sortOrder)
             'label' => __('Sample'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 40,
         ];
         $sampleTypeField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,
@@ -411,29 +407,27 @@ protected function getSampleColumn($sortOrder)
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getShareableColumn($sortOrder)
+    protected function getShareableColumn()
     {
         $shareableField['arguments']['data']['config'] = [
             'label' => __('Shareable'),
             'formElement' => Form\Element\Select::NAME,
             'componentType' => Form\Field::NAME,
             'dataType' => Form\Element\DataType\Number::NAME,
             'dataScope' => 'is_shareable',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 50,
             'options' => $this->shareable->toOptionArray(),
         ];
 
         return $shareableField;
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getMaxDownloadsColumn($sortOrder)
+    protected function getMaxDownloadsColumn()
     {
         $maxDownloadsContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -442,7 +436,7 @@ protected function getMaxDownloadsColumn($sortOrder)
             'label' => __('Max. Downloads'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 60,
         ];
         $numberOfDownloadsField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,

diff --git a/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php b/app/code/Magento/Downloadable/Ui/DataProvider/Product/Form/Modifier/Samples.php
@@ -183,19 +183,18 @@ protected function getRecord()
             'children',
             $record,
             [
-                'container_sample_title' => $this->getTitleColumn(10),
-                'container_sample' => $this->getSampleColumn(20),
+                'container_sample_title' => $this->getTitleColumn(),
+                'container_sample' => $this->getSampleColumn(),
                 'position' => $recordPosition,
                 'action_delete' => $recordActionDelete,
             ]
         );
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getTitleColumn($sortOrder)
+    protected function getTitleColumn()
     {
         $titleContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -204,7 +203,7 @@ protected function getTitleColumn($sortOrder)
             'showLabel' => false,
             'label' => __('Title'),
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 10,
         ];
         $titleField['arguments']['data']['config'] = [
             'formElement' => Form\Element\Input::NAME,
@@ -220,10 +219,9 @@ protected function getTitleColumn($sortOrder)
     }
 
     /**
-     * @param int $sortOrder
      * @return array
      */
-    protected function getSampleColumn($sortOrder)
+    protected function getSampleColumn()
     {
         $sampleContainer['arguments']['data']['config'] = [
             'componentType' => Container::NAME,
@@ -232,7 +230,7 @@ protected function getSampleColumn($sortOrder)
             'label' => __('File'),
             'showLabel' => false,
             'dataScope' => '',
-            'sortOrder' => $sortOrder,
+            'sortOrder' => 20,
         ];
         $sampleType['arguments']['data']['config'] = [
             'formElement' => Form\Element\Select::NAME,