From cad44a3db14797f7fd2978e1c2a252e785fc0ec1 Mon Sep 17 00:00:00 2001 From: Saravanan Date: Sat, 19 May 2018 15:26:18 +0530 Subject: [PATCH 01/10] 15210-Fixed product tier pricing pagination issue in admin --- .../js/components/dynamic-rows-tier-price.js | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index b5c0e7a95d401..bafb8672e5e80 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -28,6 +28,32 @@ define([ }); this.labels(labels); + }, + + /** + * Change page + * + * @param {Number} page - current page + */ + changePage: function (page) { + this.clear(); /* Clear the children when directly edit the text field */ + if (page === 1 && !this.recordData().length) { + return false; + } + + if (~~page > this.pages()) { + this.currentPage(this.pages()); + + return false; + } else if (~~page < 1) { + this.currentPage(1); + + return false; + } + + this.initChildren(); + + return true; } }); }); From 560aa38603ac0cd7762ff7d791c598f734eb5435 Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Sun, 20 May 2018 06:31:23 +0530 Subject: [PATCH 02/10] Fixed coding related issue --- .../view/adminhtml/web/js/components/dynamic-rows-tier-price.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index bafb8672e5e80..430b3882d29db 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -37,6 +37,7 @@ define([ */ changePage: function (page) { this.clear(); /* Clear the children when directly edit the text field */ + if (page === 1 && !this.recordData().length) { return false; } From 8a8ed6613cebd8bddd1f1d9504af47d8ac18cc55 Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Tue, 22 May 2018 10:34:47 +0530 Subject: [PATCH 03/10] Removed Illegal trailing whitespace. --- .../view/adminhtml/web/js/components/dynamic-rows-tier-price.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index 430b3882d29db..45211faa550b7 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -37,7 +37,7 @@ define([ */ changePage: function (page) { this.clear(); /* Clear the children when directly edit the text field */ - + if (page === 1 && !this.recordData().length) { return false; } From ba6bf77e781dd633134a293a1521d13938cabf07 Mon Sep 17 00:00:00 2001 From: Saravanan Date: Wed, 23 May 2018 10:31:08 +0530 Subject: [PATCH 04/10] Removed newly added comments --- .../view/adminhtml/web/js/components/dynamic-rows-tier-price.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index 45211faa550b7..8d8a40a639db3 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -36,7 +36,7 @@ define([ * @param {Number} page - current page */ changePage: function (page) { - this.clear(); /* Clear the children when directly edit the text field */ + this.clear(); if (page === 1 && !this.recordData().length) { return false; From 6de6006220c91be431e68710b481e50393ed2578 Mon Sep 17 00:00:00 2001 From: Saravanan Date: Wed, 23 May 2018 10:46:11 +0530 Subject: [PATCH 05/10] Inherited the parent method to fix pagination issue --- .../adminhtml/web/js/components/dynamic-rows-tier-price.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index 8d8a40a639db3..4c94b02576b3f 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -30,11 +30,7 @@ define([ this.labels(labels); }, - /** - * Change page - * - * @param {Number} page - current page - */ + /** @inheritdoc */ changePage: function (page) { this.clear(); From ec3eb1ae80716712b1fca54a7becc62a4686815b Mon Sep 17 00:00:00 2001 From: Saravanan Date: Wed, 23 May 2018 18:11:45 +0530 Subject: [PATCH 06/10] Fixed product tier pricing pagination issue in admin --- .../js/components/dynamic-rows-tier-price.js | 23 ------------------- .../base/web/js/dynamic-rows/dynamic-rows.js | 2 ++ 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js index 4c94b02576b3f..b5c0e7a95d401 100644 --- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js +++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-tier-price.js @@ -28,29 +28,6 @@ define([ }); this.labels(labels); - }, - - /** @inheritdoc */ - changePage: function (page) { - this.clear(); - - if (page === 1 && !this.recordData().length) { - return false; - } - - if (~~page > this.pages()) { - this.currentPage(this.pages()); - - return false; - } else if (~~page < 1) { - this.currentPage(1); - - return false; - } - - this.initChildren(); - - return true; } }); }); diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js index 680b6a2b1e54e..75a9c920c6531 100644 --- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js +++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js @@ -721,6 +721,8 @@ define([ * @param {Number} page - current page */ changePage: function (page) { + this.clear(); + if (page === 1 && !this.recordData().length) { return false; } From 75960ce8d73e7d924d9f9bf820e4c82a2b0ff543 Mon Sep 17 00:00:00 2001 From: Volodymyr Zaets Date: Thu, 24 May 2018 11:54:46 +0300 Subject: [PATCH 07/10] 15210-Fixed product tier pricing pagination - Fix prevPage and nextPage method. Calling clear method was added to changePage method. --- .../Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js index 75a9c920c6531..7537107560cb4 100644 --- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js +++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js @@ -764,7 +764,6 @@ define([ * Change page to next */ nextPage: function () { - this.clear(); this.currentPage(this.currentPage() + 1); }, @@ -772,7 +771,6 @@ define([ * Change page to previous */ previousPage: function () { - this.clear(); this.currentPage(this.currentPage() - 1); }, From 9ebdcc5dfb83794b6c1b7ef66e0b3784257c3174 Mon Sep 17 00:00:00 2001 From: Leandro Ferraz Luvisotto Date: Thu, 24 May 2018 14:03:30 +0200 Subject: [PATCH 08/10] Duplicate array keys --- .../Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php index 8d65153d7ba20..a370cbea13c2b 100644 --- a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php @@ -1336,7 +1336,6 @@ public function testSaveExistingWithMediaGalleryEntries() $expectedResult = [ [ - 'value_id' => 5, 'value_id' => 5, "label" => "new_label_text", 'file' => 'filename1', From 8e1487927b2a71f907ecd4393ea16f90532872b5 Mon Sep 17 00:00:00 2001 From: Leandro Ferraz Luvisotto Date: Thu, 24 May 2018 14:16:25 +0200 Subject: [PATCH 09/10] Return tag misspelled --- .../ReleaseNotification/Ui/Renderer/NotificationRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php index a43b33b5a8cdf..c4760bd9d28c3 100644 --- a/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php +++ b/app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php @@ -174,7 +174,7 @@ private function buildFooter(array $footer) * correct HTML format. * * @param string $content - * @returns string + * @return string */ private function formatContentWithLinks($content) { From 530592b8c956c8d1ac2bbcf8ac0a29b7f25b668c Mon Sep 17 00:00:00 2001 From: vgelani Date: Tue, 22 May 2018 10:27:46 +0530 Subject: [PATCH 10/10] Moved css from media #TODO --- .../Magento_Theme/web/css/source/_module.less | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less index b5742b86cf9f1..94f34cd0cf1e1 100644 --- a/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less +++ b/app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less @@ -62,17 +62,16 @@ // Common // _____________________________________________ -& when (@media-common = true) { - body { +.page-wrapper { + .ie9 & { .lib-css(background-color, @page__background-color); + min-height: 0; } +} - // ToDo UI: move it directly to .page-wrapper (now it doesn't appear in mediaquery cuz of size of css) - .page-wrapper { - .ie9 & { - .lib-css(background-color, @page__background-color); - min-height: 0; - } +& when (@media-common = true) { + body { + .lib-css(background-color, @page__background-color); } //