From 8e43c07da042bff3a60a03205711b67500b25fdc Mon Sep 17 00:00:00 2001 From: Riccardo Tempesta Date: Sat, 26 May 2018 15:56:23 +0200 Subject: [PATCH 1/8] FIX fo rissue #15510 - First PDF download / export after login --- app/code/Magento/Backend/App/AbstractAction.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/app/code/Magento/Backend/App/AbstractAction.php index ba90bc0c3e210..ffcbf3028b060 100644 --- a/app/code/Magento/Backend/App/AbstractAction.php +++ b/app/code/Magento/Backend/App/AbstractAction.php @@ -214,6 +214,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false); $this->_view->renderLayout(); $this->_request->setDispatched(true); + return $this->_response; } @@ -223,6 +224,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request) $this->_processLocaleSettings(); + // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510) + if ($this->_auth->isLoggedIn()) { + $this->_auth->getAuthStorage()->isFirstPageAfterLogin(); + } + return parent::dispatch($request); } From 07f4c535c0e9352be8462ec35c7c7ed09aaa1550 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Mon, 4 Jun 2018 18:45:08 +0200 Subject: [PATCH 2/8] Added additional headers for avoid customer data caching --- app/code/Magento/Customer/Controller/Section/Load.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Customer/Controller/Section/Load.php b/app/code/Magento/Customer/Controller/Section/Load.php index e99dcdb2cf96a..dbe640ef2a365 100644 --- a/app/code/Magento/Customer/Controller/Section/Load.php +++ b/app/code/Magento/Customer/Controller/Section/Load.php @@ -61,6 +61,8 @@ public function execute() { /** @var \Magento\Framework\Controller\Result\Json $resultJson */ $resultJson = $this->resultJsonFactory->create(); + $resultJson->setHeader('Cache-Control', 'max-age=0, must-revalidate, no-cache, no-store', true); + $resultJson->setHeader('Pragma', 'no-cache', true); try { $sectionNames = $this->getRequest()->getParam('sections'); $sectionNames = $sectionNames ? array_unique(\explode(',', $sectionNames)) : null; From 8bacebe148db04b6d4fdb495e2ceae3ab52e4de2 Mon Sep 17 00:00:00 2001 From: Chirag Matholiya Date: Tue, 5 Jun 2018 09:41:04 +0530 Subject: [PATCH 3/8] Removed unnecessary css. --- .../Magento/luma/web/css/source/_actions-toolbar.less | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less index 096b93675a92c..d81d0a8388a78 100644 --- a/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less +++ b/app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less @@ -22,10 +22,6 @@ &:last-child { margin-bottom: 0; } - - &.primary { - // &:extend(.abs-button-l all); - } } &:last-child { From 1206e787b566d0f6cf1e3c78b4a96fc57105322e Mon Sep 17 00:00:00 2001 From: viral-wagento Date: Tue, 5 Jun 2018 11:09:25 +0530 Subject: [PATCH 4/8] change for : Prevent multiple add-to-cart initializations in case of ajax loaded product listing --- .../Catalog/view/frontend/web/js/catalog-add-to-cart.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js index a819e4248fea7..3c969fc784bd5 100644 --- a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js +++ b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js @@ -33,6 +33,10 @@ define([ _bindSubmit: function() { var self = this; + if (this.element.data('catalog-addtocart-initialized')) { + return; + } + this.element.data('catalog-addtocart-initialized', 1); this.element.on('submit', function(e) { e.preventDefault(); self.submitForm($(this)); From 68e19afa92a4ff98278eaa5654806eb18cce31d3 Mon Sep 17 00:00:00 2001 From: Riccardo Tempesta Date: Sun, 22 Apr 2018 19:37:57 +0200 Subject: [PATCH 5/8] Fix for issue 911 found on MSI project - Cannot read property source_code of undefined Dynamic data rows were failing due to a read after delete condition Rows were removed just before the information update. An undefined javascript error was triggered. --- .../Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js index f9586981b4419..4cbb971073d79 100644 --- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js +++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js @@ -104,9 +104,8 @@ define([ * @param {String|Number} recordId */ deleteRecord: function (index, recordId) { - this._super(); - this.updateInsertData(recordId); + this._super(); }, /** From e09462d71d4708e5bfa54a3bfa377bf867f01521 Mon Sep 17 00:00:00 2001 From: Yaroslav Rogoza Date: Tue, 5 Jun 2018 17:28:19 +0200 Subject: [PATCH 6/8] Fixed return type hinting in DocBlocks for Wishlist module --- app/code/Magento/Wishlist/Block/Rss/EmailLink.php | 2 +- app/code/Magento/Wishlist/Block/Rss/Link.php | 2 +- app/code/Magento/Wishlist/Helper/Data.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php index fe0d3ba0f8c79..23b6a334e435f 100644 --- a/app/code/Magento/Wishlist/Block/Rss/EmailLink.php +++ b/app/code/Magento/Wishlist/Block/Rss/EmailLink.php @@ -22,7 +22,7 @@ class EmailLink extends Link protected $_template = 'rss/email.phtml'; /** - * @return string + * @return array */ protected function getLinkParams() { diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php index f671cbd3cd6d6..2c9093669db7d 100644 --- a/app/code/Magento/Wishlist/Block/Rss/Link.php +++ b/app/code/Magento/Wishlist/Block/Rss/Link.php @@ -69,7 +69,7 @@ public function isRssAllowed() } /** - * @return string + * @return array */ protected function getLinkParams() { diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php index 469c4771646af..aff4894a7dee4 100644 --- a/app/code/Magento/Wishlist/Helper/Data.php +++ b/app/code/Magento/Wishlist/Helper/Data.php @@ -500,7 +500,7 @@ public function isAllowInCart() /** * Retrieve customer name * - * @return string|void + * @return string|null */ public function getCustomerName() { From 1b810a5d73c2b3a302a2ea78efea0dd44c9ef78a Mon Sep 17 00:00:00 2001 From: Stanislav Idolov Date: Wed, 6 Jun 2018 14:42:25 +0300 Subject: [PATCH 7/8] =?UTF-8?q?ENGCOM-1849:=20[Backport]=20Resolved=20:=20?= =?UTF-8?q?Styling=20select=20by=20changing=20less=20variables=20in=20Luma?= =?UTF-8?q?=20theme=E2=80=A6=20#15796?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/Magento/Sniffs/Less/PropertiesSortingSniff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php index 1f637e6b92876..963bb689a7921 100644 --- a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php +++ b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php @@ -101,7 +101,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr) private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $properties) { // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens. - $symbolsForSkip = ['(', 'block']; + $symbolsForSkip = ['(', 'block', 'field']; $properties = array_filter( $properties, function ($var) use ($symbolsForSkip) { From 5b34517ffada38f95a2ec0deae9e20a6b628ab4a Mon Sep 17 00:00:00 2001 From: hitesh-wagento Date: Thu, 7 Jun 2018 10:07:46 +0530 Subject: [PATCH 8/8] --- .../Magento/blank/web/css/source/_sections.less | 4 +--- .../Magento/blank/web/css/source/_variables.less | 10 ++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/design/frontend/Magento/blank/web/css/source/_sections.less b/app/design/frontend/Magento/blank/web/css/source/_sections.less index d5d6e5a3d105c..f0a3518c92a8b 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_sections.less +++ b/app/design/frontend/Magento/blank/web/css/source/_sections.less @@ -20,9 +20,7 @@ .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { .product.data.items { - .lib-data-tabs( - @_tab-content-border-top-status: true - ); + .lib-data-tabs(); } } diff --git a/app/design/frontend/Magento/blank/web/css/source/_variables.less b/app/design/frontend/Magento/blank/web/css/source/_variables.less index 5d946dd8a826e..256bc796dba94 100644 --- a/app/design/frontend/Magento/blank/web/css/source/_variables.less +++ b/app/design/frontend/Magento/blank/web/css/source/_variables.less @@ -15,6 +15,16 @@ @font-family-name__base: 'Open Sans'; @font-family__base: @font-family-name__base, @font-family__sans-serif; +// +// Sections variables +// _____________________________________________ + +// +// Tabs +// --------------------------------------------- +@tab-content__border-top-status: true; + + // // Sidebar // ---------------------------------------------